ja'Kha-jay 1
CSS work
set up apocrypha for markup
deploy shuffle
visual studio glitch not replicated in practice
markup work
CSS and scripting work
Merge branch 'develop'

Conflicts:
	resources/scripts/math.js
	shuffle/index.html