Merge pull request #14 from leituo56/Dev_TuoLei

Dev tuo lei
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei