tinkered witht he incomes look
Merge branch 'master' of https://github.com/aguazales/childcare

Conflicts:
	site/childcare/app/views/incomes/index.html.erb