proxy
Merge branch 'master' of https://github.com/if12b088/SWE2_Micro_ERP_GUI.git
small changes
Merge branch 'master' of https://github.com/if12b088/SWE2_Micro_ERP_GUI.git
Merge branch 'master' of https://github.com/if12b088/SWE2_Micro_ERP_GUI.git
Address GUI fix