committing to merge remote
Merge branch 'master' of https://github.com/manderelee/csc309
fixed bug in upvoting sort