Added location to the UI
Merge branch 'master' of github.com:carlism/MisterCarson
added a rules page