Adding host
Adding host
Adding host
mergin
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/settings/test.py
Added sippies.herokuapp.com to test.py ALLOWED_HOSTS