Final minor changes to C++ code, ready for demonstrations
Added code to evaluate - mainly user study eval, but also the other models.
For user study, mainly preparing for stats with SPSS.