Update cours.txt and subtitle.sh
Merge https://github.com/kiago/isepse2014
Update presentation.txt

Add additional comments to our presentation (powerpoint)
Update questions.txt get user input

how to get user input ???
new answers to my questions
cours + projet update
fix conflicts
new answer
new answer
fix conflict in my project (subtitle)
Merge pull request #117 from tferrand/master

new answers + rename variable
Revisions SaaS PaaS IaaS
OpenShift logs
debug file
modify marmiton.sh + project explanations + powerpoint
Merge pull request #119 from ameliemarichal/master

modify marmiton.sh + project explanations + powerpoint
Merge pull request #118 from nass59/master

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