impresion de escarapelas con codigo de barras
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/Controller/PeopleController.php