gemfile.lock updated
Merge branch 'master' into models

Because it is.
because we need to work!
Merge branch 'master' into models
created seeds
Merge pull request #7 from ShadyPenguin/models

Models