Some CSS stuff
Merge branch 'master' of https://github.com/ckelman/URhungry

Conflicts:
	urHungry/app/views/welcome/index.html.erb
Nothing, it's just making me do this
Merge branch 'master' of https://github.com/ckelman/URhungry into wolf