message for commit
commintingMerge branch 'commiting'

Conflicts:
	a
diff test
comiintsndk