merge conflict - bugfix
Merge pull request #11 from flymke/dev

Dev
Merge branch 'dev' of https://github.com/flymke/mark-posts
Cleanup
Live preview for markers to add
Setup