finished located_at
Merge branch 'master' of http://github.com/bsknowl/mondial-java

Finished the located_at method and changed one or two classes.