make a basic user model
Merge branch 'master' of https://github.com/konstantinwirz/sample_app

Conflicts:
	app/models/user.rb
	test/models/user_test.rb