new line
b241 solution
hotfix
more
merged
fixes
fixes
beta fixes
moore
mooreless
dumb
Merge branch 'iss922_2'

Conflicts:
	test2
Merge branch 'dumbidea'