Changed PP4 to PP1, organized a bit
merge
fixed conflicts
Merge branch 'master' of https://github.com/liangzuoren/PBL-Group-13235
calculated time to reach dead space