added comment
merging
Merge branch 'master' of github.com:pochuan/cs166