input stream update
Merge branch 'master' of https://github.com/yinxu-cmu/15640-p1
before debug