updated getData()
Merge branch 'web' of https://github.com/OxfordBrookes/Tracker into web