added a testing frameworkgit add .
Merge branch 'pages' into gh-pages