Now added
Merge branch 'master' of github.com:antoinelafontaine/introduction-to-git

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md