Adição do Simple Form
Merge branch 'master' of https://github.com/HenriqueLacerda/ControleVendaManutencao

Conflicts:
	Gemfile.lock