asd
Merge branch 'master' of https://github.com/RonaldoMoraes/iPatrimony

Conflicts:
	workspace/Gemfile.lock
ta pronta a parada