moving test.html into proper folder
Merge branch 'master' into gh-pages

* master:
  moving test.html into proper folder