crap
Merge branch 'master' of https://github.com/davepaul0/shout

Conflicts:
	shoutsite/shoutsite/settings.py
	shoutsite/shoutsite/urls.py
deleted conflicts...