commitsmarcon
Revert "remove useless files"

This reverts commit b884bbbfac09e3aa2823b086dde0af9a98e892fd.
change note.txt
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
read et vim
Merge branch 'master' of https://github.com/nicolasroger17/isepldc2014
ssh key
Create wanhong
Change
rep
name
Changes
Delete useless
Changes
z