remove merge conflict stuff
Merge branch 'master' of github.com:jacobcmurphy/whatsgoingon
comment broken code
Merge branch 'master' of github.com:jacobcmurphy/whatsgoingon