calculo de iva
Merge branch 'master' of https://github.com/gustavo000/Equipo-Rocket

Conflicts:
	db/development.sqlite3
	log/development.log