Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
added upvote and Date stuff to model
added question upvote
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
Merge pull request #98 from lamorie/master

Added Answer Upvotes
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project

Conflicts:
	QuestionApp/res/layout/activity_question.xml
	QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/QuestionActivity.java