Started work on timeline, as well as minor changes to pages
Merge branch 'master' into timeline

Conflicts:
	test/unit/baby_test.rb
	test/unit/event_test.rb
Merge branch 'master' into timeline
Merge branch 'timeline' into timeline_frontend
Render events on timeline
filtering/grouping by day
Dynamically size notes
More work on the days
Run migration
Merge branch 'master' into timeline_frontend
Merge branch 'timeline' into timeline_frontend

Conflicts:
	app/controllers/timeline_controller.rb
	app/views/timeline/index.html.erb
	config/routes.rb
blah
Merge branch 'master' into timeline
More timeline changes
Merge branch 'master' of github.com:rcos-babynotes/babynotes
Merge branch 'timeline' into timeline_frontend
Also add measurements to timeline

Conflicts:
	app/views/timeline/index.html.erb
Change measurement style
Made the data structure easier to work with
Day shown
Headings