Added 3d Text
fixed merge conflict

Conflicts:
	Assets/PlaneOnly.unity