Commit from bzg computer
Merge pull request #1 from bzg/master

Commit from bzg computer
Delete test files and add my directory
Merge pull request #2 from bzg/master

Delete test files and add my directory
Commit by nassim
Commit from amelie
add bzg
commit by said
modified empty.txt
commit alain
Update empty.txt

web if
Ajout des notes personnelles
Merge branch 'master' of https://github.com/nass59/isepse2014 into nass59-master

Conflicts:
	bzg.txt
add bzg
Del bzg
mathieu
Rm useless files
Directory by nassim
Ajout du dossier personnel
test3