did work on client/server communication
working on the delete method on the real database
Merge remote-tracking branch 'Jason/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/CoursesPage.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
Almost done with the fake database. All I need to learn is how to delete
something off the database and to update data in the database.
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
finding the user in registration
Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java