Merge pull request #95 from lamorie/master

Added Upvotes to Questions
Cody and I implemented local sorting tasks
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into Sort
add upvotes as an attribute and sort three tasks committed by scott and cody
Merge pull request #96 from CMPUT301F14T14/Sort

Sort
Added Answer Upvotes