gitignore
Merge branch 'master' of github.com:freakimkaefig/itt_lamm_lechler

Conflicts:
	.gitignore