Modification du fichier gitignore
Modification du gitignore
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	.gitignore