.
Merge branch 'gh-pages' of https://github.com/Aerolab/jsconfar into gh-pages