databases added
Merge remote-tracking branch 'origin/master' into db/setup

Conflicts:
	README.md
	app/models/user.rb
	app/models/userpreference.rb
	db/schema.rb
Merge pull request #1 from sloptoad/db/setup

Db/setup