Botones
Merge branch 'master' of https://github.com/elib0/pos

Conflicts:
	css/ospos.css