Committing last changes before hd replacement
Merge branch 'master' of https://github.com/1Rogue/Discipline.git