Merge pull request #30 from thatcoderguy/master

Merge changes.
Started working on password encryption
Merge pull request #71 from widagroup/master

Started working on password encryption