Merge branch 'master' of https://github.com/knagra/farnsworth
Moved events urls into events/urls.py
Removed the kingman images from master
Merge branch 'master' into kingman