Merge pull request #13 from otorres86/master

fixed bug in popup
Merge branch 'master' of https://github.com/jeche/dehackathon2