test
Merge branch 'master' of https://github.com/truongtho1603/LFC

Conflicts:
	Documents/Studying/Thesis/Little Funny Chicken/.DS_Store
	Documents/Studying/Thesis/Little Funny
Chicken/LittleFunnyChicken.spritebuilder/.DS_Store
	Documents/Studying/Thesis/Little Funny
Chicken/LittleFunnyChicken.spritebuilder/Source/ChatSoundViewViewControl
ler.m
	Documents/Studying/Thesis/Little Funny Chicken/Resource/.DS_Store