Modified a liitle
Merge branch 'master' of github.com:abccb1/cs252Final