Trying to get the signin working again
changed the client side user package name
added entry to fake database for convienience
Fixed a few little things
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/.classpath
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.java
haven't fixed it
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
Replacing the class selection spinner
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/AddCourse.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/servlet/Userpage.java
did some work in the database so that we can display courses
did some work in the database so that we can display courses
Merge remote-tracking branch 'sam/master'
fixing courses
fixing the user model class
Merge remote-tracking branch 'Cody/master'

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