first commit
added models
Merge remote-tracking branch 'origin/master' into db/setup

Conflicts:
	README.md
	app/models/user.rb
	app/models/userpreference.rb
	db/schema.rb