Merge pull request #1 from Laremere/master

Project setup