Generate a new Rails application
Run rails generate rspec:install
Change database settings in Gemfile
Create welcome controller
Create .travis.yml
Add settings for heroku into .travis.yml
end
Revert "end"

This reverts commit 307297022b8294cadec6c3c1e5fa8ca1c8c47141.
OK
Merge https://github.com/YukioMakuta/MakutaSystem

Conflicts:
	app/views/welcome/index.html.erb
3
Update index.html.erb
Merge pull request #1 from YukioMakuta/test

Update index.html.erb
a
test
 test2
test
Merge pull request #2 from YukioMakuta/test

test
0202
Merge branch 'master' of github.com:YukioMakuta/MakutaSystem

Conflicts:
	app/views/welcome/index.html.erb