Adding a very basic tree
Merge origin/master