finished no link if no location part 2
Merge branch 'master' of github.com:jacobcmurphy/whatsgoingon