Testing merge changes
Pulled updates from Master / updates to Location and World class
Fix long-int in Location.toString Method
Merge pull request #2 from ButlerSource/Lincoln

Pull updates to lincoln