ignored some settings files!
did something but I don't know what.
Merge branch 'master' of https://github.com/vancan1ty/programmateurs