Merge pull request #18 from nkparikh/master

Added login activity
made some changes to layout
Chuan/Chris - added BrowseQuestions JUnit test
Chris/Chuan - added partial JUnit tests for uses cases 3 and 6.
Finished 2 and 5.
Chris/Chuan - commented out some tests. Found duplicates.
Chris/Chuan - added sort by date tests.
gantt file
modified layout, looking nicer
Chuan/Chris - added tests for sorting by date, upvotes, and image.
Merge pull request #19 from 0nebit/master

Chris/Chuan partial JUnit
Test username problem.
modified adapter. Now the ui scrolls nicely. App looking sick. Good stuff. Pair programming Ivan and Aaron
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/resources.ap_
Merge pull request #20 from ibarreto/master

Lots of changes to layout. Looking good
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Chuan/Chris - added tests to add images to questions and answers.
Chuan/Chris - partial test for upvoting questions.
Merge pull request #21 from 0nebit/master

Upvote tests.
Chuan/Chris - added tests for searching questions and answers.
Merge pull request #22 from 0nebit/master

Chuan/Chris - added tests for searching questions and answers.