Added scripts for auto-merging, pushing, and pulling changes
Merge branch 'master' of https://github.com/knagra/farnsworth
updated comments on home page
Merge branch 'master' into dev
Moved events urls into events/urls.py
Merge branch 'dev' of github.com:knagra/farnsworth into dev
Removed the kingman images from master
Merge branch 'master' of github.com:knagra/farnsworth
Fixed the links to events
Added a test for the site map
Fixed the site map test
updated site map
minor update
rearranged menu
removed list of utilities from site map
merged master, resolved issues