First commit; ADD: rails
Merge branch 'master' of github.com:smarquezs/sample-with-minitest

Conflicts:
	.gitignore