modified:   app/controllers/HomeController.php
	modified:   app/views/home/welcome.blade.php
	modified:   app/views/users/create.blade.php
	new file:   app/views/users/upload.blade.php
	modified:   public/carpetasArchivos/06012832522014-10-032014-10-14.pdf
	modified:   public/carpetasArchivos/06020818382014-10-012014-10-19.pdf
	modified:   public/css/bootstrap.min.css
	modified:   public/css/easy-responsive-tabs.css
	new file:   public/css/easy-responsive-tabs1.css
	modified:   public/js/Browser.js
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	app/views/home/welcome.blade.php

	modified:   app/controllers/MapasBalancedController.php
modified:   app/views/home/welcome.blade.php
	modified:   app/views/mapasbalanced/cont_audi_bsc.blade.php
	modified:   app/views/mapasbalanced/empresas_bsc.blade.php
	modified:   app/views/mapasbalanced/fade_bsc.blade.php
	modified:   app/views/mapasbalanced/finanzas_bsc.blade.php
	modified:   app/views/mapasbalanced/marketing_bsc.blade.php
	modified:   app/views/mapasbalanced/transporte_bsc.blade.php
	new file:   public/32.PNG
	modified:   public/images/example.drawIndicator.png