gem の更新
Merge pull request #78 from daitokai/gem-update

gem の更新
Merge branch 'master' into install-spring-commands/rspec

Conflicts:
	Gemfile.lock