Initial commit
Initial Commit
Merge branch 'master' of https://github.com/a-uesugi-unisrv/JenkinsExamination

Conflicts:
	.gitignore
簡単なモデルとテストを追加
連携確認
db関連のデータがpush出来ていなかった
InitialCommit
aaa
Merge branch 'master' of https://github.com/a-uesugi-unisrv/JenkinsExamination

Conflicts:
	.gitignore
	.project
	Gemfile
	Gemfile.lock
	Rakefile
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
Merge branch 'master' of https://github.com/a-uesugi-unisrv/JenkinsExamination3

Conflicts:
	.gitignore
	README.md