Slight modifications.
Merge branch 'student' of ssh://github.com/tsauvine/o4 into student
Debugging and working on UX.