put solids and platforms on maps
Merge branch 'master' into feature/collision
put solids on level 5
added enemy and hero spawns
shored up the images for our assets
Merge branch 'feature/collision' into develop

* feature/collision:
  added enemy and hero spawns
  put solids on level 5
  put solids and platforms on maps