dummy 2
Merge branch 'master' of github.com:tcarette/gitSeminar

Conflicts:
	gitSeminar.tex

Using my version