fixed alot
Merge branch 'master' of github.com:Jawsarn/BossJam_2014
blabla