data manager
Merge branch 'lastDay' of https://github.com/peter26194/NTUDepartmentDefense into lastDay
Merge branch 'simpdanny' of https://github.com/peter26194/NTUDepartmentDefense into simpdanny