Merge branch 'feature/bird1204' into devlop
m
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/menuViewController.h
	miniGame/menuViewController.m
	miniGame/menuViewController.xib
	miniGame/refViewController.m
手動整合
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame/entryViewController.xib