first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	config/database.yml
	config/routes.rb
	db/schema.rb