fix
Merge branch 'master' of https://github.com/tyu1/Computing-Project-Twitter
fix 2