Merge remote-tracking branch 'Cody Howard/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'Cody Howard/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'origin/master'
making the app have controller
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