Added Admin Function with Devise CanCan
Push errors
Merge errors