merged also
Final changes before presentation
Merge branch 'master' of https://github.com/TuxedoFish/YRS14