change folder name
Merge branch 'master' of github.com:nicolasroger17/isepldc2014

Conflicts:
	thierry.zhang/nicolas.roger.nicolasroger17.txt