error repaired
Merge branch 'master' of github.com:mogria/ggj2014