Merge branch 'Game'

Conflicts:
	app/src/main/java/edu/uark/csce/tilebreaker/TileBreakerActivity.java
Merge remote-tracking branch 'origin/master'