test
Merge branch 'master' of https://github.com/XuefengZhai/AppointmentScheduler

Conflicts:
	bin/classes/com/cmu/as/LogIn$PlaceholderFragment.class
	bin/classes/com/cmu/as/LogIn.class
	bin/classes/com/cmu/as/R$id.class
	bin/classes/com/cmu/as/R$integer.class
	bin/classes/com/cmu/as/R$layout.class
	bin/classes/com/cmu/as/R$menu.class
	bin/classes/com/cmu/as/R$string.class
	bin/classes/com/cmu/as/R$style.class
	bin/classes/com/cmu/as/R$styleable.class
test