.
Merge branch 'master' of https://github.com/uesports135/CSI418-TeamTwoTicTacToe

Conflicts:
	build/classes/.gitignore