Merge branch 'bittelc'
up a line

up a line
Merge branch 'dibaggioj'

Conflicts:
	README.md
Merge branch 'master' into dibaggioj
last trial!

last trial
Merge branch 'dibaggioj'
Merge branch 'master' into bittelc