pop up box half way through
merge conflict resolved
Merge pull request #19 from boredsteve/pop-up-box

Pop up box