Worked somemore on collision detection still not working right. Only seems to work when it's going to hit the top or bottom. Need to think about how to approach this further problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixed the collision physics it is now working. Still appears slightly inside the spike but once the death animation is done I don't think it'll be noticeable.