Adjusted timing and modifying Upvote
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
modified some layouts for final display
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/gen/com/brogrammers/agora/R.java
	Agora/res/layout/question_object.xml
	Agora/src/com/brogrammers/agora/QuestionAdapter.java