changed map size
added cucumber tests for markers
fixed merge conflicts in Gemfile.lock
Merge pull request #15 from binaryberry/master

fixed merge conflicts in Gemfile.lock