modified urls
Merge branch 'master' of https://github.com/bitrainbow/sleepy

Conflicts:
	sleepy/sleepy/urls.py
	sleepy/sleepy/urls.pyc
i'm not even sure what i'm commiting here, should have been commiting along the way but its been a week, must commit more often