vagrant 追加
Merge branch 'master' into develop

Conflicts:
	rbtest/.gitignore
	rbtest/Gemfile
	rbtest/Gemfile.lock
	rbtest/README.rdoc
	rbtest/Rakefile
	rbtest/app/assets/javascripts/application.js
	rbtest/app/assets/javascripts/users.js.coffee
	rbtest/app/assets/stylesheets/application.css
	rbtest/app/assets/stylesheets/users.css.scss
	rbtest/app/controllers/application_controller.rb
	rbtest/app/controllers/users_controller.rb
	rbtest/app/helpers/application_helper.rb
	rbtest/app/helpers/users_helper.rb
	rbtest/app/views/layouts/application.html.erb
	rbtest/app/views/users/index.html.erb
	rbtest/bin/bundle
	rbtest/bin/rails
	rbtest/bin/rake
	rbtest/bin/spring
	rbtest/config.ru
	rbtest/config/application.rb
	rbtest/config/boot.rb
	rbtest/config/database.yml
	rbtest/config/environment.rb
	rbtest/config/environments/development.rb
	rbtest/config/environments/production.rb
	rbtest/config/environments/test.rb
	rbtest/config/initializers/assets.rb
	rbtest/config/initializers/backtrace_silencers.rb
	rbtest/config/initializers/cookies_serializer.rb
	rbtest/config/initializers/filter_parameter_logging.rb
	rbtest/config/initializers/inflections.rb
	rbtest/config/initializers/mime_types.rb
	rbtest/config/initializers/wrap_parameters.rb
	rbtest/config/locales/en.yml
	rbtest/config/routes.rb
	rbtest/config/secrets.yml
	rbtest/db/seeds.rb
	rbtest/public/404.html
	rbtest/public/422.html
	rbtest/public/500.html
	rbtest/public/robots.txt
	rbtest/test/controllers/users_controller_test.rb
	rbtest/test/helpers/users_helper_test.rb
	rbtest/test/test_helper.rb
	server/rbtest/.gitignore
	server/rbtest/Gemfile
	server/rbtest/Gemfile.lock
	server/rbtest/README.rdoc
	server/rbtest/Rakefile
	server/rbtest/app/assets/javascripts/application.js
	server/rbtest/app/assets/javascripts/users.js.coffee
	server/rbtest/app/assets/stylesheets/application.css
	server/rbtest/app/assets/stylesheets/users.css.scss
	server/rbtest/app/controllers/application_controller.rb
	server/rbtest/app/controllers/users_controller.rb
	server/rbtest/app/helpers/application_helper.rb
	server/rbtest/app/helpers/users_helper.rb
	server/rbtest/app/views/layouts/application.html.erb
	server/rbtest/app/views/users/index.html.erb
	server/rbtest/bin/bundle
	server/rbtest/bin/rails
	server/rbtest/bin/rake
	server/rbtest/bin/spring
	server/rbtest/config.ru
	server/rbtest/config/application.rb
	server/rbtest/config/boot.rb
	server/rbtest/config/database.yml
	server/rbtest/config/environment.rb
	server/rbtest/config/environments/development.rb
	server/rbtest/config/environments/production.rb
	server/rbtest/config/environments/test.rb
	server/rbtest/config/initializers/assets.rb
	server/rbtest/config/initializers/backtrace_silencers.rb
	server/rbtest/config/initializers/cookies_serializer.rb
	server/rbtest/config/initializers/filter_parameter_logging.rb
	server/rbtest/config/initializers/inflections.rb
	server/rbtest/config/initializers/mime_types.rb
	server/rbtest/config/initializers/session_store.rb
	server/rbtest/config/initializers/wrap_parameters.rb
	server/rbtest/config/locales/en.yml
	server/rbtest/config/routes.rb
	server/rbtest/config/secrets.yml
	server/rbtest/db/seeds.rb
	server/rbtest/public/404.html
	server/rbtest/public/422.html
	server/rbtest/public/500.html
	server/rbtest/public/robots.txt
	server/rbtest/test/controllers/users_controller_test.rb
	server/rbtest/test/helpers/users_helper_test.rb
	server/rbtest/test/test_helper.rb
	vagrant/app2/.gitignore
	vagrant/app2/Gemfile
	vagrant/app2/Gemfile.lock
	vagrant/app2/README.rdoc
	vagrant/app2/Rakefile
	vagrant/app2/app/assets/javascripts/application.js
	vagrant/app2/app/assets/javascripts/users.js.coffee
	vagrant/app2/app/assets/stylesheets/application.css
	vagrant/app2/app/assets/stylesheets/users.css.scss
	vagrant/app2/app/controllers/application_controller.rb
	vagrant/app2/app/controllers/users_controller.rb
	vagrant/app2/app/helpers/application_helper.rb
	vagrant/app2/app/helpers/users_helper.rb
	vagrant/app2/app/views/layouts/application.html.erb
	vagrant/app2/app/views/users/index.html.erb
	vagrant/app2/app/views/users/show.html.erb
	vagrant/app2/bin/bundle
	vagrant/app2/bin/rails
	vagrant/app2/bin/rake
	vagrant/app2/bin/spring
	vagrant/app2/config.ru
	vagrant/app2/config/application.rb
	vagrant/app2/config/boot.rb
	vagrant/app2/config/database.yml
	vagrant/app2/config/environment.rb
	vagrant/app2/config/environments/development.rb
	vagrant/app2/config/environments/production.rb
	vagrant/app2/config/environments/test.rb
	vagrant/app2/config/initializers/assets.rb
	vagrant/app2/config/initializers/backtrace_silencers.rb
	vagrant/app2/config/initializers/cookies_serializer.rb
	vagrant/app2/config/initializers/filter_parameter_logging.rb
	vagrant/app2/config/initializers/inflections.rb
	vagrant/app2/config/initializers/mime_types.rb
	vagrant/app2/config/initializers/wrap_parameters.rb
	vagrant/app2/config/locales/en.yml
	vagrant/app2/config/routes.rb
	vagrant/app2/config/secrets.yml
	vagrant/app2/db/seeds.rb
	vagrant/app2/public/404.html
	vagrant/app2/public/422.html
	vagrant/app2/public/500.html
	vagrant/app2/public/robots.txt
	vagrant/app2/test/controllers/users_controller_test.rb
	vagrant/app2/test/helpers/users_helper_test.rb
	vagrant/app2/test/test_helper.rb