modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/controllers/UserController.php
	modified:   app/views/fade/fade_sgc.blade.php
	modified:   app/views/home/layout.blade.php
	modified:   app/views/users/create.blade.php
	modified:   app/views/users/empleados.blade.php
	modified:   app/views/users/show.blade.php
	new file:   public/66.PNG
	modified:   public/images/example.drawIndicator.png
	modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   public/66.PNG
	modified:   public/images/1.PNG
	modified:   public/images/example.drawIndicator.png
	new file:   public/js/framebox_foto.js
	modified:   public/js/framebox_reporte.js
	modified:   public/js/framebox_reporte.js~