add line 2
add line 4
Merge branch 'master' into B1

Conflicts:
	Readme.txt
add kernel