Merge pull request #26 from ruijunhuang2010/gh-pages

Acceptance upate
Updated /test/e2e/runner.html test to pass using a controllertest.html page
Merge pull request #1 from SMU-SIS/gh-pages

update