"see if the gitignore effective when I want ignore some directory"
see if the .gitignore
Merge branch 'master' of https://github.com/lightman21/the_new_note

Conflicts:
	day_command.txt
	java_my_thinking.java
	th_code/workspace/.metadata/.mylyn/.tasks.xml.zip
	th_code/workspace/.metadata/.mylyn/tasks.xml.zip