Merge pull request #1 from leituo56/Dev_TuoLei

Dev tuo lei
Description

Changed project description
Merge pull request #2 from leituo56/Dev_Jenn

Description merged. Well done Jenn
Sammie's testing 

testing
Merge pull request #4 from sammiexiu/patch-1

Sammie's testing
Well done
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei

Conflicts:
	README.md
Try to resolve conflict