rewrote sleeper stuff
Merge branch 'master' of https://github.com/rozifus/TeamStrong13_4

Conflicts:
	por/settings.py