test
Merge branch 'master' into gh-pages
removed redundancy
text edit
remove email
Merge branch 'gh-pages'
fix conflict

Conflicts:
	index.html