jkdsfhkulskasjhfkjl
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Added some very basic collision detection. Probably not in the the best place but it works so far. Also added a glodal DEBUG to Game so that it wil be easier to get rid of various debugging info that we are using.