Movement works, now onto collisions
basic collisions
Merge branch 'master' of https://github.com/Bradshaw/hairy-dubstep
Merge branch 'master' of https://github.com/Bradshaw/hairy-dubstep
Posting to the wind, need coffee