first commit
first commit
Merge branch 'master' of https://github.com/igoegabr/ror-intro

Conflicts:
	.gitignore