Lots of tweaks and finalizations
Merge branch 'master' of https://github.com/dvera2/ggj2014