FSM updates
Merge branch 'master' of https://github.com/bbatarelo/vr-jam

Conflicts:
	Assets/holo_001.unity