Merge branch 'master' of github.com:rcos-babynotes/babynotes
Edge cases accounted for
Merge pull request #8 from rcos-babynotes/timeline

Timeline
Merge branch 'master' into timeline_frontend

Conflicts:
	app/controllers/timeline_controller.rb