fix canvas background
Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient

Conflicts:
	js/canvas.js
	js/main.js
fix main.js
minor fixes
Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient
nodejitsu deployment completely functional