Changing user.rb file acc to global rules
Changing user.rb file acc to global rules after nikhil rev
Merge branch 'vgarg2' of github.com:joshnikhil234/expertiza into rails4