commit for merge
Merge branch 'master' of github.com:Gark/Helicopter
added Locations, and trees