Markers jump to next world copy
Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge pull request #42 from atungare/dev

Implemented MERGE cypher query to update user data on POST from login
Render feed as subview of map
Resolve merge conflict
Merge pull request #43 from vreddy18/master

Render feed as subview of map...and other things