merge
Merge branch 'master' of github.com:ArneH/ggj2014
Merge branch 'master' of github.com:ArneH/ggj2014
bugfixes
merge