Merged with Cody?
Needs Fixing.
Merge remote-tracking branch 'Jason/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java