Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/libs/modelClasses.jar
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'Jason/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml
Merge remote-tracking branch 'CodyHoward/master'

Conflicts:
	TGOHProject/libs/modelClasses.jar
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Fixed up client side, only need to add database operations
fixed a bug in teacher notification
Merge remote-tracking branch 'sam/master'
small layout enhancements
Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml