初回コミット
Merge branch 'master' of https://github.com/emtem/rails_first_app

Conflicts:
	.gitignore
	README.md