初始化项目
Merge branch 'master' of github.com:diguage/rails4tutorial

Conflicts:
	.gitignore
初始化Gemfile