Merge branch 'gh-pages'
Merge branch 'master' of github.com:zirrusc/citafes-projects
fix