Cleanup
Matches tab and stuff
Merge commit 'HEAD@{4}'

Conflicts:
	TP2_BD2/MainWindow.xaml
Merge branch 'master' of https://github.com/kazelone/TP2_BD2

Conflicts:
	TP2_BD2/MainWindow.xaml
	TP2_BD2/MainWindow.xaml.cs