ajout de 2/3 truc
Merge branch 'master' of https://github.com/HappyDestroy/GetMyCard
Merge branch 'master' of https://github.com/HappyDestroy/GetMyCard

Conflicts:
	GetMyCard/MainPage.xaml
	GetMyCard/ViewModels/ViewModelMaCarte.cs
	GetMyCard/ViewModels/ViewModelMainPage.cs
Merge branch 'master' of https://github.com/HappyDestroy/GetMyCard

Conflicts:
	GetMyCard/MainPage.xaml
	GetMyCard/ViewModels/ViewModelMaCarte.cs
	GetMyCard/ViewModels/ViewModelMainPage.cs