Ike did some code! Mainly graphics though... Added lots of tiles! If you didn't read you skype messages check them jordan! They will go into more detail on the things i did
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
left collision can smd