local fix
Merge branch 'master' of https://github.com/LArchaon/juis2012_git_lessons