Can now challenge from show_quiz page
Merge branch 'master' into challenge-enhancements

Conflicts:
	Quiz Website/src/quiz/User.java
Removed print statement, added image dims
Merge pull request #52 from kmblake/challenge-enhancements

Challenge enhancements