first validations for models
fixed merge conflicts in gemfile
Merge pull request #8 from s-loar/model_validations

first validations for models