Initial project version.
Initial project version.
Merge branch 'master' of https://github.com/CMPUT274-Project/colour_wars

Conflicts:
	README.md