UI Workflow
Merge branch 'master' of https://github.com/usercngit/INF123_TeamCSS

Conflicts:
	.DS_Store
	srcGame/GameBoard.pyc
	srcGame/GameScreen.pyc