remove winter childcare
Merge branch 'master' of https://github.com/tmornini/synergy

Conflicts:
	app/views/home/index.html.erb
	app/views/live/index.html.erb
more