feature1 add time
add ubuntu time
solve conflice ubuntu and Deepin
Merge branch 'feature1'

Conflicts:
	readme