Updating quiz and fixing incorrectly sized image
Merge branch 'master' of https://github.com/mefuru/hipstertipster

Conflicts:
	public/images/12.jpg