Added a location class
Merge branch 'master' of https://github.com/gearedmonkey/Kingme.git