update ubuntu office
Merge branch 'master' of https://github.com/lightman21/the_new_note

Conflicts:
	c_note.c
	th_code/workspace/.metadata/.mylyn/.tasks.xml.zip
	th_code/workspace/.metadata/.mylyn/tasks.xml.zip
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/thinking_in_java/.markers.snap
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/thinking_in_java/.syncinfo.snap
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	th_code/workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
	th_code/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	th_code/workspace/.metadata/.plugins/org.eclipse.jdt.core/2953740120.index
	th_code/workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	th_code/workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	th_code/workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	th_code/workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml