Edit README.
Merge branch 'master' of https://github.com/WenTingZhu/temp
Merge branch 'master' of https://github.com/WenTingZhu/temp

Merge conflict.
Edit README.