gitignore
Merge branch 'master' of https://github.com/BenjaminBrossi/SEPS13-Gruppe5

Conflicts:
	.gitignore