Tidying Up
Merge branch 'master' of https://github.com/JonahStanley/DjangoSpike

Conflicts:
	Forum/Forum/urls.py