Added the project
Changed the tests to reflect our own little world
Merge branch 'setup' into testing