Merge remote-tracking branch 'Cody Howard/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Worked on activity pages and added a resource page
Trying to deal with Jason's lack of Github knowledge.
fixed a couple names
Merge remote-tracking branch 'Cody Howard/master'
Merge branch 'master' of ssh://git@github.com/shamor/TGOH.git

Conflicts:
	TGOHProject/res/layout/activity_main.xml
Fixed up some merge conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Fixing up the last few merge conflicts
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/res/layout/schedule_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/controller/adduser.java
	TGOHServerside/.classpath
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml