Step Collider 3
Merge branch 'master' of https://github.com/Anixen/VirtualJam2014_11_21