finished
Merge branch 'master' into jin-Yuan
Merge branch 'jin-Yuan' into Dream
修改player define
Merge branch 'Dream' into jin-Yuan
add Square
地圖square, 炸彈不可重複放置
修改炸彈 不可重複放
Merge
Merge branch 'jin-Yuan'

Conflicts:
	Bomber/MapData.m
merge
Metge Complete
..
Merge branch 'master' into lin
Merge branch 'lin'
Merge branch 'master' into Dream

Conflicts:

Bomber.xcodeproj/project.xcworkspace/xcuserdata/dream.xcuserdatad/UserIn
terfaceState.xcuserstate