changing me2nus
Merge remote-tracking branch 'origin/master'

Conflicts:
	edit_order.php
Revert "added susseion start a bunch of palces"

This reverts commit 0ce25f19466fa580be07fc47f28d444a8413b2a3.
Merge branch 'master' of https://github.com/kimminahm/BIT4444

ommit 0ce25f19466fa580be07fc47f28d444a8413b2a3.