UPDATING GARRETS FILES
Merge branch 'master' of https://github.com/fmcat/CS460-Android-Project

Conflicts:
	PaxPopuli/res/layout/appointment_list.xml
	PaxPopuli/src/com/example/paxpopuli/Appointment_List.java