added crypto folder with changes updated on cameron's folder
Merge remote-tracking branch 'origin/master'