Merge branch 'mike' of https://github.com/cyntzhou/final into mike
Merge branch 'mike'
Merge branch 'master' of https://github.com/cyntzhou/final