devise added
Merge pull request #2 from alexand3rsc0tt/devise

devise added
merge conflict