Merge and move
Merge branch 'master' of github.com:fauskanger/ggj13