GUI fixed, data populated
Merge branch 'master' of https://github.com/andrew-kirkham/Airtime