Make a basic User model (including secure passwords)
Merge branch 'master' of https://github.com/Ixil/Rails-Tutorial

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