website and test updates
merged terminyzer's lost changes
merged the flora portion
Add initial directories