new markers
Merge branch 'master' of github.com:jacobcmurphy/whatsgoingon