all new stuffs
Merge branch 'master' into gh-pages

* master:
  all new stuffs

Conflicts:
	index.html