Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
Merge remote-tracking branch 'sam/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
For Carl to fix.
almost finished with the server side
worked a little bit with the controllers
Merge remote-tracking branch 'jason/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
Merge remote-tracking branch 'sam/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/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/RegistrationForCourses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
Fixed the Serverside's changing password and implemented in the client
side. Also fixed error in the serverside and client side.
Mergin with Jason