Merge branch 'master' of https://github.com/csontos/BFH-Gruppenarbeit

Conflicts:
	import.csv
import angepasst