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

Conflicts:
	README.md
Try to resolve conflict
Merge pull request #6 from leituo56/Dev_TuoLei

Dev tuo lei