inicio
Merge remote-tracking branch 'origin/master'

Conflicts:

	smartcities/themeforest-6705726-stroller-mobile-tablet-responsive-template/code/inicio-sesion.html