Add devise
Resolve devise commit conflicts
Merge pull request #2 from alexaltair/deviseAuth

Add devise