Implemented collision handling
Merge branch 'master' of github.com:LD-26-IO-Team/ld26

Conflicts:
	ld26/src/io/github/ldears/ld26/map/TileType.java