Main structure
Merge branch 'master' of github.com:Stuff90/UXScientist-test