Using CanCan for permissions
Trying to fix conflicts
Merge branch 'master' of https://github.com/TehWhale/ElixirThread