Merge pull request #36 from HoltMaki/master

website update
new tree for ui
tree fix
Merge pull request #2 from PurpleKangaroo/master

merge