add table of content
Merge branch 'master' into gh-pages

Conflicts:
	Makefile
update gh-pages