Sync with Alejandro
Merge branch 'master' of https://github.com/alexreedhill/choreboard

Conflicts:
	app/views/households/show.html.erb