Commiting with errors.
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
Created 3 new xml files.  Worked on other teacher-related xml files.  We
now (I think) have a non-dynamic notification page, but the old version
is still there in comments in case we go back to it.
Merge remote-tracking branch 'Cody/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 'JasonFiddle/master'

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