Collision fix and stuff
Merge branch 'master' of https://github.com/IVProductions/JimsWoods

Conflicts:
	.idea/workspace.xml