a change
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	OmegaRift/Assets/Scripts/Actor.cs