a bullshit!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hslu_feukora/Main.java