GIT Trial
GIT Trail
Merge branch 'master' of git://github.com/Nathan-Bisson/MAD9135 into Nathan-Bisson-master

Conflicts:
	README.md
Merge branch 'Nathan-Bisson-master'