Merge pull request #1 from rice-apps/master

After login renders temp.html
Revert "After login renders temp.html"
Merge pull request #2 from fdrozdowski/revert-1-master

Revert "After login renders temp.html"
Merge branch 'master' of https://github.com/fdrozdowski/roommate-finderThere are both local and remote commits. Please commit all your changes and then sync again.

Conflicts:
	app.db
	app/views.py
	roommatefinder.wsgi