Merge pull request #20 from R1V3R5/master

very basic
Merge pull request #21 from R1V3R5/master

devise functional...had to merge
Merge remote-tracking branch 'upstream/master'