tree are done and more
Merge remote-tracking branch 'upstream/master'
Merge branch 'travis' of https://github.com/travisws/src
Charles committed this, it's probably wrong but he's kinda dumb
Merge pull request #7 from travisws/master

trees