working on migration
solved some merge conflicts in schema.rb
Merge pull request #3 from oconn/models

Models