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
Merge pull request #1 from rcos-babynotes/testing

Automated Testing