Commit by nassim
Merge branch 'master' of https://github.com/nass59/isepse2014 into nass59-master

Conflicts:
	bzg.txt
Del bzg