Merge conflict
Merge branch 'master' of https://github.com/samheather/SpotTheStation
Adding first version of updating UI