devise functional
Merge pull request #21 from R1V3R5/master

devise functional...had to merge