added changing collors
Merge branch 'standard-angular-generator-base' of https://github.com/commjoen/tic-tac-toe-experiment into standard-angular-generator-base

Conflicts:
	client/app/main/main.controller.js