- Made a basic User model with secure password
Merge branch 'master' of github.com:giuseppecuccu/sample_app

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb