commitsmarcon
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bonjour_nico.txt
Merge branch 'master' of https://github.com/nicolasroger17/isepldc2014
Merge branch 'master' of https://github.com/nicolasroger17/isepldc2014
first commit
Update vim.txt
English translation
Questions Reponses
Merge pull request #56 from john2512/master

Questions Reponses
notes cours3
question malin
Merge pull request #58 from illonage/master

question malin
basic folder scrapping
test json
Change
rep
name
Changes
Delete useless
Changes