db models
Merge branch 'development' of github.com:satukark/Rails-project into development