new project
Merge remote-tracking branch 'origin/master'

Conflicts:
	datastructure/.gitignore
add package test2
Delete .classpath
Delete .project
Delete org.eclipse.jdt.core.prefs
Delete .gitignore
my pc workspace
Merge remote-tracking branch 'origin/master'
delete
my mac workspace
Merge remote-tracking branch 'origin/master'
add test2 package
Merge branch 'master' of
https://github.com/jingguofeng/datastructure.git
add package test3
add test4
add test5
Merge branch 'my_pc'
add test6
Merge remote-tracking branch 'origin/my_pc' into my_pc

Conflicts:
	datastructure/.gitignore