Algo
Merge branch 'master' of https://github.com/bacchi-rafael/rails_training1

Conflicts:
	README.md