fixing shit
Merge branch 'dev' of git@github.com:danielkinjerski/GameJame2013_Sept.git into dev
mainly for player