Solving merge conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmput301t03appTEST-test/src/ViewQuestionUITest.java
Merge pull request #371 from pachalad/master

Tests and stuff