Updating
Merge branch 'gh-pages' of github.com:guillego/coc2015 into gh-pages