Merge branch 'master' of https://gitlab.cas.mcmaster.ca/mullentc/3xa3-group-project

src/src/module/demo/aes-worker.js

src/src/module/demo/demo.html

src/src/module/demo/hash-worker.js

src/src/module/demo/pretzel-worker.js

src/src/module/demo/pretzel-worker2.js

src/src/module/demo/scrypt.js

src/src/module/dist/bundle.js

src/src/module/index.js

src/src/options/options.html