删除无用文件，修改后台文件
Merge remote-tracking branch 'origin/UI' into UI

Conflicts:
	Timeer/app/src/main/java/com/example/app/Note/NotepadAdapter.java