test
test gone
added html labeling
added more labeling
added .gitignore
tidied up
Merge branch 'develop'

* develop:
  tidied up
  added .gitignore
  added more labeling
  added html labeling
  test gone
  test
added convertMS to dataServer
added real time uptime
Merge branch 'develop'

* develop:
  added real time uptime
  added convertMS to dataServer