I'm a noob
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project Implementation/onClickInventory/onClickInventory/frmAddDiscount.Designer.cs
	Project Implementation/onClickInventory/onClickInventory/frmAddDiscount.cs
	Project Implementation/onClickInventory/onClickInventory/frmManageUser.Designer.cs
	Project Implementation/onClickInventory/onClickInventory/frmManageUser.cs

JESUS THIS WAS TOUGH