Merge branch 'revert-72ff3650' into 'master'

Revert "Merge branch 'uc41' into 'master'"

See merge request !20

iTrust/src/edu/ncsu/csc/itrust/dao/mysql/ApptDAO.java

@@ -342,7 +342,7 @@ public class ApptDAO {
 			conn = factory.getConnection();
 
 			pstring = conn.prepareStatement(
-					"SELECT * FROM appointment WHERE " + // select appointments where
+					"SELECT * FROM appointment WHERE " + /*" sched_date.after(?)=TRUE AND sched_date.before(?)=TRUE");*/
 							"DATE(sched_date)<=DATE_ADD(CURRENT_DATE, INTERVAL ? DAY) AND " + //sched_date day is before or at (numDays) days from now
 							"sched_date>=CURRENT_DATE");	// sched_date is after today