a little mistake
Merge remote-tracking branch 'origin/master'
Changed a lot of things and add a lot of comments
Hopefully last commit with final result for the presentation