2013-11-21-3-18 final

//TODO
let resource to be static
我成功搶到電腦留下紀念
test
Resource Complete

完成static Resource 化
新增 人物素材
 resource

給dream整合
Merge remote-tracking branch 'origin/Jin-Yuan'

Conflicts:
	Bomber.xcodeproj/project.pbxproj
	Bomber.xcodeproj/project.xcworkspace/xcshareddata/Bomber.xccheckout

Bomber.xcodeproj/project.xcworkspace/xcuserdata/luoboy.xcuserdatad/UserI
nterfaceState.xcuserstate
	Bomber/Control.h
	Bomber/Control.m
	Bomber/Kernel.h
	Bomber/Kernel.m
	Bomber/MapData.h
	Bomber/MapData.m
	Bomber/Player.h
	Bomber/Player.m
	Bomber/Resource.h
	Bomber/Resource.m
update merge
...