Add more files to .gitignore
Merge branch 'master' of github.com:hausdorff/acl-conf-handbook

Conflicts:
	.gitignore