Fixing merge problems
Merge branch 'master' of https://github.com/vad710/ggj14