better stuff!
stuff i guess
Merge branch 'master' of github.com:Sind/collidoscope