initial commit
Initial commit
Merge branch 'master' of https://github.com/jeche/Hello
This is a website created by Ruby on Rails called Hello.
Merge branch 'master' of https://github.com/agaperste/Hello

Conflicts:
	README.md
merge conflict