Less than 4 hours remaining...
Resolved merge conflict
Merge branch 'master' of github.com:Dragonborns/christmas-hero
Last minute fixes and additions made during our (this time unfortunately failed) indie speed run.
Merge branch 'master' of github.com:Dragonborns/christmas-hero

Conflicts:
	js/levels/level-00.json
Added Indie Speed Run credits.