uncommented out devise
Merge branch 'master' of github.com:brandonjyuhas/hai
Merge Conflict