no message
Merge branch 'master' of https://github.com/forfunza/NewYearGame

Conflicts:
	NewYear/Assets/Resources/First Person Boy Controller.prefab
	NewYear/Assets/Scenes/GameThaiScene.unity
	NewYear/NewYear.userprefs
	NewYear/Untitled.app/Contents/Data/Managed/Assembly-CSharp-firstpass.dll
	NewYear/Untitled.app/Contents/Data/Managed/Assembly-CSharp.dll
	NewYear/Untitled.app/Contents/Data/Managed/Assembly-UnityScript-firstpass.dll
	NewYear/Untitled.app/Contents/Data/Managed/Assembly-UnityScript.dll
	NewYear/Untitled.app/Contents/Data/PlayerConnectionConfigFile
	NewYear/Untitled.app/Contents/Data/level0
	NewYear/Untitled.app/Contents/Data/mainData
	NewYear/Untitled.app/Contents/Data/resources.assets
	NewYear/Untitled.app/Contents/Data/sharedassets1.assets