initial commit
models and seed file set up for app
resolved conflict and merged gemfile