added canvas
Merge branch 'master' of https://github.com/fahimc/Dodgems

Conflicts:
	App/js/main.js