..
Merge branch 'master' into Dream

Conflicts:
	Bomber/Kernel.m
	Bomber/MapData.m
	Bomber/Player.m
subImage 擴充他的功能，小修炸彈大小

炸彈大小稍微放大點，讓他充滿格子的狀況
Merge branch 'Dream'
開始建構中 一開始給予 mapData 起始位置

方便未來，可以計算目前角色是在哪個位置
給予 MapData 初始位置
Merge remote-tracking branch 'origin/lin' into Dream

Conflicts:

Bomber.xcodeproj/project.xcworkspace/xcuserdata/dream.xcuserdatad/UserIn
terfaceState.xcuserstate
update merge
..
Merge branch 'Dream'

Conflicts:
	Bomber/Kernel.m
Merge branch 'master' of https://github.com/Dream74/Bomber