show roommate done
Merge branch 'master' of https://github.com/Lohit13/sorted

Conflicts:
	db.sqlite3
	tags/views.pyc