make a basic user model (including secure password)
Merge branch 'master' of https://github.com/pielcafe/sample_app

Conflicts:
	app/models/user.rb
	db/schema.rb