Updated README.md
Will it conflict?
A better commit message
New new added
Merge branch 'feature/4-describe-features-module'

Conflicts:
	README.md
Best README ever
Merge branch 'master' of github.com:antoinelafontaine/introduction-to-git

Conflicts:
	new.txt