saving non-merged changes to settings.py
Merge branch 'master' of https://github.com/knagra/farnsworth
Merge branch 'master' of https://github.com/knagra/farnsworth
Merge branch 'master' of https://github.com/knagra/farnsworth
Merge branch 'master' of https://github.com/knagra/farnsworth