Modifiying Question View
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/src/com/brogrammers/agora/MainActivity.java
Working on Question Adapter
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/src/com/brogrammers/agora/MainActivity.java
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Adjusting settings for adapter classes
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers