fix bugs
Merge branch 'lab3' of https://github.com/OscarLiXi/DS2014 into lab3