fixed the server
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.java
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/GetUser.java
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/adduser.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/Classes/Courses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/User/User.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/TeachersClasses.java