Merge branch 'timeline' into timeline_frontend
Render events on timeline
Dynamically size notes
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
Merge branch 'timeline' into timeline_frontend
Also add measurements to timeline

Conflicts:
	app/views/timeline/index.html.erb
Change measurement style
Merge branch 'timeline' into timeline_frontend

Conflicts:
	app/views/timeline/index.html.erb
Merge branch 'master' into timeline_frontend

Conflicts:
	app/controllers/timeline_controller.rb
Merge pull request #7 from rcos-babynotes/timeline_frontend

Timeline Frontend