primer commit del servidor
fix conflict
borra qtranslate
Merge branch 'master' of https://github.com/intervalo/santiago-reyes.com
Merge branch 'master' of https://github.com/intervalo/santiago-reyes.com
server changes
fix conflict