Some more stuff
Merge branch 'master' of https://github.com/ckelman/URhungry into charlie

Conflicts:
	urHungry/app/views/places/show.html.erb
Merge pull request #17 from ckelman/charlie

Charlie