Primeiro commit
Merge branch 'master' of github.com:gepemuks/curso-rails

Conflicts:
	.gitignore