Update documentation
Merge branch 'gh-pages'

Conflicts:
	theme/css/main.css~

Signed-off-by: tanji <nicholastanjerome@gmail.com>