asdf
new table
new table
Merge branch 'master' of https://github.com/ulikoehler/Programmierpraktikum

Conflicts:
	.gitignore