welcome
add elements
服务器通信功能
untrack bin files
add element
将Client.java,Server.java中的变量名按照规范进行更改
add map & some modifications
''
Merge branch 'graphic' into develop

Conflicts:
	HaTrick/.classpath
	HaTrick/.settings/org.eclipse.jdt.core.prefs
Merge branch 'server' into develsop

Conflicts:
	HaTrick/.classpath
	HaTrick/bin/com/hatrick/graphic/Avatar.class
	HaTrick/bin/com/hatrick/graphic/Sprite.class
	HaTrick/bin/com/hatrick/graphic/Stage.class
	HaTrick/bin/com/hatrick/resource/AnimationResource$avatars.class
	HaTrick/bin/com/hatrick/resource/ImageResource$avatars.class
	HaTrick/bin/com/hatrick/test/GraphicBasicTest.class
Merge branch 'gamelogic' into develop

Conflicts:
	HaTrick/.classpath
	HaTrick/.settings/org.eclipse.jdt.core.prefs
	HaTrick/bin/com/hatrick/graphic/AnimationInfo.class
	HaTrick/bin/com/hatrick/graphic/Avatar.class
	HaTrick/bin/com/hatrick/graphic/ImageInfo.class
	HaTrick/bin/com/hatrick/graphic/Sprite.class
	HaTrick/bin/com/hatrick/graphic/Stage$1.class
	HaTrick/bin/com/hatrick/graphic/Stage.class
	HaTrick/bin/com/hatrick/graphic/Test.class
	HaTrick/bin/com/hatrick/resource/AnimationResource$avatars$1.class
	HaTrick/bin/com/hatrick/resource/AnimationResource$avatars.class
	HaTrick/bin/com/hatrick/resource/AnimationResource.class
	HaTrick/bin/com/hatrick/resource/ImageResource$avatars$1.class
	HaTrick/bin/com/hatrick/resource/ImageResource$avatars.class
	HaTrick/bin/com/hatrick/resource/ImageResource.class
	HaTrick/bin/com/hatrick/test/GetAvatarNames.class
	HaTrick/bin/com/hatrick/test/GraphicBasicTest.class
	HaTrick/bin/com/hatrick/test/MemoryTest.class
''
''
Merge branch 'gamelogic' into develop
''
change
'addition_after_last_version'
pull commit
pull commit
merge commit