Work
Merge branch 'master' of https://github.com/ehotinger/Cardinality

Conflicts:
	index.html
	scripts/app/controllers/GameSetupController.js