Casi casi fini, le diagramme marche pas top
merge des merdes
Merge branch 'master' of https://github.com/lezhumain/GSBCS

Conflicts:
	Model/helpers/ColHelper.cs
	WpfApplication/View/MainWindow.xaml
	WpfApplication/ViewModel/MainWindowViewModel.cs