pull
Merge branch 'master' of https://github.com/GLoganDR/helloween into matt
level 1 as 1
level2
fixed conflict
level 1 update
Merge branch 'matt' of https://github.com/GLoganDR/helloween into tile
Added tilemap json files
Added levels and player collision
key, door, level2 start
Added enemies to level 1
added bullets and some other stuff
added bullets and some other stuff
coming together
mapObjects added
added sound effects, bullets kill, bullets disappear
pre merge
merging
fixed stuff
post merge