Gitignore fix
Git configuration fix
Merge branch 'master' of https://github.com/Dreando/ECOL