solved merge conflict
another merge conflict
fiddled with main html
resolved merge cnflct
got rid of two buttons, modal 'works'
index.html
Merge branch 'master' of github.com:roaringsheep/clawFront

Conflicts:
	client/index.html
make master clean so can switch branches
fixed merge conflict
housekeeping
basic queue persists and renders