Merge remote-tracking branch 'jason/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/layout/teacher_main_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
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