commiting
Merge branch 'master' of https://github.com/maslorzj/isepldc2014

Conflicts:
	bonjour_nico.txt
commit
Merge remote-tracking branch 'upstream/master'
adding cours2.txt
Merge remote-tracking branch 'upstream/master'
adding cours2.txt
Merge pull request #37 from maslorzj/master

adding cours2.txt