Make a basic User model (including secure passwords) - Updated
Merge branch 'master' of https://github.com/pvang10/sample_app

Conflicts:
	app/models/user.rb
	config/routes.rb