add item
Merge branch 'master' of https://github.com/forfunza/NewYearGame

Conflicts:
	NewYear/Assets/Scenes/GameThaiScene.unity
	NewYear/Assets/Standard Assets.meta
	NewYear/Assets/Standard Assets/Character Controllers.meta
	NewYear/Assets/Standard Assets/Character Controllers/Sources.meta
	NewYear/Assets/Standard Assets/Character Controllers/Sources/Scripts/CharacterMotor.js
	NewYear/Assets/Standard Assets/Character Controllers/Sources/Scripts/FPSInputController.js
	NewYear/Assets/Standard Assets/Character Controllers/Sources/Scripts/MouseLook.cs
	NewYear/NewYear.userprefs
Merge branch 'master' of https://github.com/forfunza/NewYearGame

Conflicts: