atualizando genfile
Merge branch 'master' of https://github.com/AndreMitsuoka/pipa_project

Conflicts:
	Gemfile
	Gemfile.lock
acao comprar