merge
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev