Conflicts:
	kont2019/src/bike/bike-rental.md
	kont2019/src/stuff/LambdaUtilities.java
	kont2019/src/stuff/stuff.md