fix
Merge branch 'master' of https://github.com/manuelbrc/Responsive

Conflicts:
	css/base.css
	css/base.styl
	index.html
	js/ajax.js
	titulos.html