Basic Game working
Merge branch 'master' of https://github.com/TeamTileBreak/TileBreaker

Conflicts:
	app/src/main/java/edu/uark/csce/tilebreaker/TileBreakerActivity.java