Update documentation
Update documentation
restored old site
Merge branch 'gh-pages' restores old site

Conflicts:
	index.html
Merge branch 'master' of github.com:jstvz/jstvz.github.io

Conflicts:
	index.html