stuff
Merge pull request #51 from pmills88/Devise

stuff