test merge
Merge branch 'master' of https://github.com/AbdellaToronto/gameon

Conflicts:
	assets/js/main.js