Merge branch 'mike'
Merge branch 'master' of github.com:cyntzhou/final
hi
Update README.md
Merge branch 'mike'
removed test files
Merge branch 'master' of https://github.com/cyntzhou/final
how to merge