question#show: added upvote display and css
Merge pull request #2 from otters-2014/single_question_view

question#show: added upvote display and css
geonames added to gemfile
Merge branch 'master' of https://github.com/otters-2014/Occam_Project into routing

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid