added different colors
Merge branch 'master' of https://github.com/gmumar/csc309

Conflicts:
	a2/game.js