Fixed the crash bug from images, fixed the bug where questions were
being re-asked
Merge branch 'master' of ssh://git@github.com/danielfinke/cpsc472.git

Conflicts:
	src/ca/unbc/cpsc472/mynextphone/ResultActivity.java