added log in
Merge branch 'mike' of https://github.com/cyntzhou/final into mike