changes before nb pull
Merge branch 'master' of github.com:cswelcher/assembly-scavenger-hunt

Changed the nb client side, syncing with server-side changes"