Add password to user model
Finish login
add gemfile.lock
Merge branch 'feature/34-login-and-model-setup'

Conflicts:
	Gemfile.lock
Fix gemfile.lock and uploaders