placeholder so i can merge...
Merge branch 'server' into dev
Edited header to extend from index
Edited the templating a bit again
Added in get events
Merge branch 'dev' of https://github.com/Kovath/Singlesmingles into dev
Created a basic page for logged in user
Merge branch 'dev' of github.com:Kovath/Singlesmingles into dev
Merge branch 'master' of github.com:Kovath/Singlesmingles into frontend
Fixed up some URLS
Finished with models
Merge branch 'dev' of https://github.com/Kovath/Singlesmingles into dev
Model redo
placeholder
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
Removed foundation, swapped to ht5bp
initial fb integration
Added some backend functions and tests
Merge branch 'frontend' of github.com:Kovath/Singlesmingles into dev
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
	Singlesmingles/__pycache__/urls.cpython-33.pyc