rename controlTest.html to main.html
Merge branch 'master' of https://github.com/jmklonowski/WhereAmI