I added a file hello.
wat
Merge branch 'dev'
Merge branch 'dev'
Remove settings.py so that .gitignore works right
Add empty quotes to secret.py.template so that we don't have errors from forgetting to add empty quotes to unused fields