Error in FakeDatabase
Merge remote-tracking branch 'CodyHoward/master'
Fixed a few errors post merge
Did work on student pages and the main activity
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/AddController.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/GetAllCourses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/getCourse.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/CoursesPage.java
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java