Merge pull request #2 from SecondGenDesign/master

Merge pull request #1 from SecondGenDesign/Tristan
Moved out of folder
Merge pull request #3 from SecondGenDesign/Tristan

Tristan