placeholder
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
Merge branch 'server' of https://github.com/Kovath/Singlesmingles into server
Pulling backwards
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
	Singlesmingles/__pycache__/urls.cpython-33.pyc
Hopefully the completion of the backend
Merge branch 'server' of https://github.com/Kovath/Singlesmingles into server
merged server down to dev
bug fix, no ternaries in python
Added in some convenient error catching to normal views
removed some db init
Merge branch 'dev' into frontend
basic front-end fixes