built up model. passed first model test
wrote more model tests. passed
 edit this file
git commit :qw
:wq
:qw
1Merge branch 'master' into model_tests

Conflicts:
	db/schema.rb