Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Add secure passwords to User model
Merge branch 'feat/add_password_to_users_model' into develop
Merge branch 'feat/user_modeling' into develop

Conflicts:
	spec/models/user_spec.rb
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop