Merge pull request #1 from picacure/gh-pages

Merge
Merge remote-tracking branch 'origin/devel' into gh-pages
Merge remote-tracking branch 'remotes/origin/devel' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'origin/gh-pages' into gh-pages