fixed issue with merge
Merge branch 'gh-pages' of github.com:vesselio/resources into gh-pages

merge