testing
Merge remote-tracking branch 'jcoady9/master'

Conflicts:
	CS496_Project_App/src/ycp/edu/cs496project/mobileApp/GameScreenActivity.java