PARIS Simon 30/12/14
exo1 done
Merge branch 'master' of https://github.com/mathieumoli/MDMiniProjet.git

Conflicts:
	README.md