A bit of refactoring...
OCD div problems with marvel_hero_image
More awesome refactoring
Considerably more refactoring
Merge branch 'master' into display-results

Conflicts:
	app/views/index.erb
	public/js/application.js
CSS Refactoring all DAY
Merge pull request #13 from nifengle/display-results

Display results