liu

hah
Merge branch 'master' of https://github.com/diaooss/CIS_GameVideo

Conflicts:
	CIS_Game_video 2/CIS_Game_video/RootViewController.m