do it
poopp
Merge branch 'corey-rewrite' of https://github.com/coreyja/CSSE490-Android into corey-rewrite

Conflicts:
	TicTacToeXtreme/res/values/strings.xml
	TicTacToeXtreme/src/edu/rosehulman/tictactoextreme/MainActivity.java