olle
Merge branch 'kalle'
Merge branch 'kalle'

Conflicts:
	kalle/boll/boll.c
renamed kalle to kalle2 and changed boll.c