testing nmy changes
Merge branch 'gh-pages' of github.com:rpless/pmgj-halloween-platformer into gh-pages

Conflicts:
	js/levelLoader.js
	js/levels/level1.js