fix addeds
bbb
Merge branch 'iss01'

Conflicts:
	contribution1.txt