Merge remote-tracking branch 'origin/master' into Mohamad-Daoud

Conflicts:
	source/MemoryGame/StartForm.cs
Merge remote-tracking branch 'origin/master' into Mohamad-Daoud

Conflicts:
	source/MemoryGame/StartForm.cs
Labels for GameBoard
Resuts
bugfix
Merge remote-tracking branch 'origin/Thines'
Merge remote-tracking branch 'origin/master' into Mohamad-Daoud

Conflicts:
	source/MemoryGame/Properties/Resources.Designer.cs
	source/MemoryGame/Properties/Resources.resx
	source/MemoryGame/Settings.cs
Resultform
Merge
Settings inställningar

inte helt klart
merge
merge
merge
Merge remote-tracking branch 'origin/Kajsa'
Settings fixade

bra
Merge remote-tracking branch 'origin/Kajsa'