Merge branch 'master' into branch_lin
Finished generate popular report
Merge pull request #42 from g2-aj/branch_lin

Branch lin
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris