Removed css that was breaking families page
Added new fields to events and child, try integrating twitter bootstrap
Merge branch 'master' of github.com:Bartuz/childhood

Conflicts:
	app/views/educators/index.erb
CSS DONE
CSS 'done'
merged
Merge branch 'master' of github.com:Bartuz/childhood
CSS fixed