fixed q4
Merge branch 'Shrub' of https://github.com/thejihuijin/Proj5 into Shrub