commit
Merge branch 'master' of https://github.com/BarOhayon/Gymaster_2.1

Conflicts:
	Gymaster_2.1/Forms/MainForm.cs
	gymaster_2.1/Forms/MainForm.Designer.cs
Merge branch 'master' of https://github.com/BarOhayon/Gymaster_2.1

Conflicts:
	Gymaster_2.1/Forms/MainForm.cs
	gymaster_2.1/Forms/MainForm.Designer.cs
sdgde bkyrrkn67n5evyvrerb4 e