Signed-off-by: mary carmen rios ramirez <maryc_182@hotmail.com>
Merge branch 'master' of https://github.com/jdpantojavalle/MxPOSv10r1
no termine!

mañana lo termino en la tarde! D:
Vista compra

ya hice la vista compra -_-
Merge branch 'master' of https://github.com/jdpantojavalle/MxPOSv10r1

Conflicts:
	MxPOS10/Styles/GreenPasture/GreenPasture.Master
	MxPOS10/Styles/GreenPasture/GreenPasture.Master.cs
	MxPOS10/Styles/GreenPasture/default.css

By Mary Rios