Merge remote-tracking branch 'Cody Howard/master'

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