Merge pull request #15 from binaryberry/master

fixed merge conflicts in Gemfile.lock
Test for marker presence now working
New test :D
added the opening the pop up test, passing