re commit
Merge branch 'master' of https://github.com/t-onizawa/demo_app

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb