I think this works
Fixes and new tests
Merge branch 'master' of https://github.com/axskern/RoomMate

Conflicts:
	Backend/db.py