updated some xml
Merge branch 'question_view_refactoring' of https://github.com/coreyjamison/Team17Project.git into question_view_refactoring
Updated xml files to have the correct content (although style is still
seriously lacking). Implemented new adapter to display both questions
and answers now.