basic demo
Merge branch 'scoring' of https://github.com/joelbaranowski/testHW04 into scoring

Conflicts:
	src/model/board/GameGridBoard.java