Merge pull request #9 from thatcoderguy/master

Merge changes
Started to implement encypted user password to use as an encryption key
Merge pull request #10 from widagroup/master

 Started to implement encypted user password to use as an encryption key