Update settings to set credentials
resolve merge conflicts
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS
Change base.html to refer to HAUS
Update login template