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
Remove extra files, annotate models
Revert "Some fixes to babies controller"

This reverts commit 27323e85237ea78fea262ebd793423adfa7c6838.
Revert changes undid in revert commit
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
resolved conflicts
date difference
resolving conflicts