commit
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_config.yml
Merge branch 'gh-pages' of https://github.com/biomod2014/stampedosaurs into gh-pages