added user model, username column to users, and users can use username to login
Merge branch 'development' of https://github.com/jeantroiani/get_a_room into development

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
merge conflict
add user and merge conflict