Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
wat
Merge branch 'develop' of https://github.com/ingrid-cespedes/vergel into develop

Conflicts:
	css/vergel.css
extra.less
Merge branch 'master' into develop
wut
Merge branch 'develop'
less fixed
Merge branch 'develop'
fixed-bottom footer
Merge branch 'develop'
less
extras
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/ingrid-cespedes/vergel into develop
Merge branch 'develop' of https://github.com/ingrid-cespedes/vergel into develop

Conflicts:
	css/vergel.css
	less/extras.less