"git is being finicky"
Merge branch 'master' of https://github.com/aguazales/childcare
Merge branch 'master' of https://github.com/aguazales/childcare
Updated the navigation and year end report
Merge branch 'master' of https://github.com/aguazales/childcare

Conflicts:
	app/views/child_arrive_depart/last_names.html.erb