Project presentation
Merge pull request #1 from thomasvanta/master

Final project after presentation