Merge pull request #71 from widagroup/master

Started working on password encryption
Password encryption now working - clean up needed + Write password decryption
Merge pull request #31 from thatcoderguy/master

Merge changes.