trying to get Nicolas' latest version

without causing any conflicts, but not sure if this will work
committing files that I haven't changed at all

because GUI is telling me I have to
Merge branch 'master' of https://github.com/SAFeSEA/pyEssayAnalyser