working tests i guess
Merge branch 'master' of https://github.com/undiscovrd/djangosite

Conflicts:
	mysite/mysite/settings.py
	mysite/mysite/urls.py