Merge branch 'Dev_TuoLei'
Try Conflict

Try Conflict, get some sense
Merge branch 'master' into Dev_TuoLei
Merge branch 'Dev_TuoLei'
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6

Conflicts:
	README.md
Try to resolve conflict