some final visual touches, seems to work
Merge branch 'master' of https://github.com/chorus-frogs-2014/NewsRank

Conflicts:
	app/assets/javascripts/controllers.js