Merge pull request #6 from 11693-01/master

lll
Merge pull request #38 from eyrelzy/master

Merge pull request #6 from 11693-01/master
fixed all bugs
Merge branch 'master' of https://github.com/11693-01/project-team01.git
Merge pull request #6 from 11693-01/master

pull final