edited miley's collision
Merge branch 'game' of github.com:TylerLubeck/MusicHack2014 into server
fix server for thing I think
fix static things