Added my stupid changes because reasons...
Merge branch 'master' of https://github.com/jpoa/RatticWeb

Conflicts:
	ratticweb/settings.py