adding an encryption for the password. The password is no longer stored in plain text
Merge branch 'master' of https://github.com/kelto/software-project