changed README
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	index.js
Merge branch 'master' into gh-pages

Conflicts:
	README.md
fixed merge conflict
fixing merge conflicts
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
rearranged about link