commented out the animation code for now
merging
Merge branch 'master' of https://github.com/kvillert/Grupp1
spikes collision detection is now working
merging