Add kao to newfile
Merge branch 'alpha'

Conflicts:
	newfile