point system working
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scene/main tuuli changes.unity