new rails app
welcome controller generated

command:
rails generate controller welcome index
welcome index as root
Merge remote-tracking branch 'origin/master'

* origin/master:
  Initial commit

Conflicts:
	.gitignore