Crypto added.
Merge branch 'master' of https://github.com/lansdon/cpts483_drc

Resolved some conflicts between the master and the DB_Branch code.