added .gitconfig and .gitignore
Merge branch 'master' of github.com:wdastru/www.ceip.unito.it

Conflicts:
	.gitignore
mod to .gitignore