modified:   app/controllers/MapasController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   app/views/Creditos.blade.php
	modified:   public/2.PNG
	modified:   public/22.PNG
	modified:   public/62.PNG
	modified:   public/css/creditos.css
	new file:   public/css/creditos.css~
	renamed:    public/images/creditos/alpa.png -> public/images/Creditos/alpa.png
	renamed:    public/images/creditos/devtem.png -> public/images/Creditos/devtem.png
	renamed:    public/images/creditos/hellfox2.png -> public/images/Creditos/hellfox2.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	app/controllers/MapasController.php
	app/views/Creditos.blade.php