changed somethings
Merge branch 'master' of github.com:michaellin/ee105miniproj