appointments are now made on the quarter hour
Merge branch 'master' of https://github.com/nugrakbari/Genetech
Merge branch 'master' of https://github.com/nugrakbari/Genetech
erina's debugging
Merge branch 'master' of https://github.com/nugrakbari/Genetech

Conflicts:
	Project2Assignment 2 3-2 4/src/project2assignment/AppointmentEntry.java