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

Conflicts:
	NewYear/Assets/Scenes/GameThaiScene.unity
	NewYear/NewYear.userprefs