saving progress
Fixes and now it loads!
Set for template work
Merge branch 'dev' of https://github.com/Kovath/Singlesmingles into dev

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
	Singlesmingles/__pycache__/urls.cpython-33.pyc
	Singlesmingles/settings.py
	Singlesmingles/urls.py
Template now loads``
placeholder so i can merge...
Merge branch 'server' into dev