Adds models and migrations

Conflicts:
	app/models/user.rb
	db/schema.rb
	log/development.log
Merge branch 'add_initial_models'

Conflicts:
	app/models/user.rb
	db/schema.rb
	log/development.log
Update gemfile.lock