add a txt
delete
add
change
add
Delete fetchmail_for_mac.rtf
add
add
add
change
add
add
add 2 files
add project
add reportofproject.rtf
restaurant_project
move subtitles test files to a folder
change folder name
Merge branch 'master' of github.com:nicolasroger17/isepldc2014

Conflicts:
	thierry.zhang/nicolas.roger.nicolasroger17.txt
Merge pull request #81 from wanhong123/master

add reportofproject.rtf