added user authorization using pundit
resolving work tree
added user.rb back to master