Adding user model

rails generate model User name:string email:string
Merge branch 'master' into modeling-users
Fixing merge problem
Adding user validation + test
Adding index to db schema
Adding passwords