minor changes
Merge branch 'master' of https://github.com/kevinlemei/CS112-Project

Conflicts:
	GameCell.java