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

Conflicts:

Documents/Studying/Thesis/AntSmasher.spritebuilder/AntSmasher.xcodeproj/
project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuser
state
	Documents/Studying/Thesis/Little Funny
Chicken/LittleFunnyChicken.spritebuilder/LittleFunnyChicken.xcodeproj/pr
oject.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserst
ate