open at home
10/28 P06:12
git test
test finish
1101 PM0438
11/01 P07:39
setting ignore
setting ignore
set ignore
set ignore
commit
11/02

增加 class Story
11/02

註解修改
add picture
123
Merge branch 'master_new_add_gameView' of https://github.com/orangehunter/Music-Salvation into master_new_add_gameView

Conflicts:
	MusicSalvationSDKVerson/bin/MusicSalvationSDKVerson.apk
	MusicSalvationSDKVerson/bin/classes.dex
	MusicSalvationSDKVerson/bin/resources.ap_
fix chart bottom issu
video class finished

影片播放CLASS完成
1104
Merge remote-tracking branch 'origin/master_new_add_gameView' into master_new_add_gameView

Conflicts:
	MusicSalvationSDKVerson/bin/MusicSalvationSDKVerson.apk
	MusicSalvationSDKVerson/bin/classes.dex
	MusicSalvationSDKVerson/bin/resources.ap_