push john.monroche/cours1.txt
elbarjo cretin
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
tutorial grep v2
tutorial find
Merge pull request #40 from a1mery/master

tutorial find
Merge pull request #39 from wtragnee/master

commit group 5 ls
Merge pull request #38 from neirdahcier/master

tutorial grep v2
Merge pull request #37 from maslorzj/master

adding cours2.txt
create projects directory
roger_thomas_pajot project description
grep v3
Add presentations.org with short notes about the projects
Merge branch 'master' of github.com:nicolasroger17/isepldc2014