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
Merge branch 'master' of https://github.com/nicolasroger17/isepldc2014

Conflicts:
	tutorials/ls.txt
Merge pull request #61 from smarcon/master

Tuto vim