cambio de botones
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/catalogo/42.php
	App/catalogo/81.php
	App/catalogo/84.php
	App/frmIndex.php
	App/nuevo/nuevoCont.php
Merge branch 'master' of https://github.com/darkber/egresos

Conflicts:
	css/pantallabase.css