Continued work
Merge branch 'ReworkProcess' of github.com:KenCoder/scala-notebook-1 into ReworkProcess
Continued work
Continued fixing of tests