no message
Merge branch 'master' of https://github.com/Ohho20/shadow-illusion
Merge branch 'master' of https://github.com/Ohho20/shadow-illusion

# By James Coddington
# Via James Coddington
* 'master' of https://github.com/Ohho20/shadow-illusion:
  no message

Conflicts:
	client/assets/map/level04.tmx
Fixed the image names and exported all images to pngs