initial commit
Merge branch 'haskellTemplate' into uebung6

Conflicts:
	.gitignore