adding project marmiton to project directory + adding augustin_guillaud git log.txt
ppt of our project
Merge branch 'master' of github.com:aguillaud/isepse2014