two files test
test 5
Merge branch 'simple-NH'

Conflicts:
	AssemblyInfo.cs