using devise now
Merge branch 'master' of github.com:alexlo03/CodeSwap