validations added
User model updates
Fix merge conflicts
Fix merge conflicts again
Merge pull request #2 from paulhyunkim/dinnabranch

validations added