Ready for pull.
Merge branch 'master' of https://github.com/ptbarthelemy/cs224u-project
ready for pull.
fixed merge