Remove test/ directory
Add tests and get them to pass
Merge branch 'master' into testing

Conflicts:
	app/models/baby.rb
	app/models/measurement.rb
Merge branch 'master' into testing

Conflicts:
	app/models/measurement.rb
merged master into testing, resolved conflicts
merged master into testing, resolved conflicts
db:migrate, just making sure everything is up to date
edited tests to get them all to pass
Add images to events
Merge pull request #1 from rcos-babynotes/testing

Automated Testing
Merge pull request #6 from rcos-babynotes/images

Event Images
require authentication
Merge branch 'master' of github.com:rcos-babynotes/babynotes
added measurement happened_at
More work on the days
resolved conflicts
blah
Merge branch 'master' into timeline
More timeline changes