servlet calls
Merge branch 'master' of https://github.com/donsalari/Taptastic

Conflicts:
	bin/Taptastic.apk
	bin/classes.dex

bin/classes/com/csci580/taptastic/AnnouncmentsFragments$AnnoucementstIte
mAdapter.class
	bin/classes/com/csci580/taptastic/AnnouncmentsFragments.class

bin/classes/com/csci580/taptastic/AppointmentsFragment$AppointmentItemAd
apter.class
	bin/classes/com/csci580/taptastic/AppointmentsFragment.class
	bin/classes/com/csci580/taptastic/LoginActivity.class
	bin/classes/com/csci580/taptastic/MainActivity.class
	bin/classes/com/csci580/taptastic/NewAppointment.class
	bin/classes/com/csci580/taptastic/SignUPActivity.class
	bin/resources.ap_
	src/com/csci580/taptastic/AnnouncmentsFragments.java