renamed kalle to kalle2 and changed boll.c
renamed boll.c to boll2.c
ny fil med samma namn som gamla
Merge branch 'master' into kalle

Conflicts:
	kalle/boll/boll.c
Merge branch 'kalle'