added popup
hiding popup
Merge branch 'master' of https://github.com/ajones/ggj2014