Trying to make answer upvotes consistent, sorta works I think maybe
Merge branch 'master' of https://github.com/CMPUT301F14T11/TEAMLORT