Still working on Server and Client communications
Got everything to delete
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/GetUserController.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/RegistrationForCourses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
Working on displaying/adding/deleting announcements
still cannot delete properly
Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/test.db/db.lck
	TGOHServerside/test.db/log/log.ctrl
	TGOHServerside/test.db/log/log1.dat
	TGOHServerside/test.db/log/logmirror.ctrl