modified:   .DS_Store
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/.DS_Store
	modified:   app/assets/javascripts/application.js
	modified:   app/assets/javascripts/index.js
	modified:   app/assets/stylesheets/bootstrap_and_overrides.css.less
	new file:   app/assets/stylesheets/jquery.cookie.js
	new file:   app/controllers/.application_controller.rb.swp
	new file:   app/controllers/.index_controller.rb.swi
	new file:   app/controllers/.index_controller.rb.swj
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/index_controller.rb
	modified:   app/views/index/.index.html.erb.swl
	modified:   app/views/index/index.html.erb
	new file:   app/views/layouts/.application.html.erb.swo
	modified:   app/views/layouts/.application.html.erb.swp
	modified:   app/views/layouts/application.html.erb
	new file:   config/.DS_Store
	modified:   config/application.rb
	modified:   config/initializers/amazon_ecs.rb
	new file:   config/locales/.en.yml.swp
	new file:   config/locales/.ja.yml.swp
	modified:   config/locales/en.yml
	new file:   config/locales/ja.yml
	new file:   config/locales/zh-CN.yml
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/CloverEc/first_app

Conflicts:
	app/controllers/.index_controller.rb.swj
	app/views/layouts/application.html.erb

	modified:   app/controllers/index_controller.rb