Write more tests and modify User model
Fix merge conflict
Merge pull request #10 from sunny-mittal/sunny

Sunny