Merge branch 'master' into gh-pages
some changes for deployment
Merge branch 'gh-pages' of https://github.com/msanchezmora/EspaciosEnDesuso into gh-pages

Conflicts:
	js/dec-principal.js
	rakefile
Actualizo redirección a subdominio de 15mcordoba.net
Update CNAME
Styles to match poster
Style changes
adding CNAME
added cabecera
changing order of calling functions
waiting for ready DOM
Remove CSS image reference
add thumbnail for social media
fix typo
add time of the event
Merge branch 'gh-pages'