COLORSFUL WITH PRETTY PRETTYNESS
COLORSFUL ADDED @~!!! SO PRETTY
Merge branch 'master' of https://github.com/benrki/COMP2911Project

Conflicts:
	Controller.java
	ControllerBoardPanel.java
	ControllerInputPanel.java