Resolve merge conflict
Merge branch 'master' of https://github.com/dasmith91/ggj-2014