Fixed bug
Merge branch 'master' of github.com:stianfauskanger/ggj14