Hello world
Merge branch 'master' of https://github.com/AnthonyB28/RailsBeginner

Conflicts:
	.gitignore