Merge pull request #2 from hotemup/master

ertf
Merge pull request #24 from ricklon/master

cleaned up html, and fixed image tag errors.
Merge pull request #3 from hotemup/master

argh
Update level1.json
Update level1.json
Merge pull request #27 from ssugrim/master

Updated map
Changed shape of icon for current location.
Merge pull request #4 from hotemup/master

cfgn
Update level1.json
Merge pull request #28 from ssugrim/master

sdga
Merge pull request #29 from ricklon/master

Music, images
Merge remote-tracking branch 'upstream/master'
adjusted the image colors. Fixed some javascript typos.