Changed tree generation to fix a few small bugs
Merge branch 'master' of https://github.com/JustinBis/CS123-Final