all the shitz
Merge branch 'master' of github.com:jakeobrien/blind

Conflicts:
	Assets/SFX/vo-english.meta
	Assets/SFX/vo-english/attack.meta
	Assets/SFX/vo-english/attack/attack-1.wav.meta
	Assets/SFX/vo-english/attack/attack-2.wav.meta
	Assets/SFX/vo-english/attack/attack-3.wav.meta
	Assets/SFX/vo-english/attack/attack-4.wav.meta
	Assets/SFX/vo-english/attack/attack-5.wav.meta
	Assets/SFX/vo-english/attack/attack-6.wav.meta
	Assets/SFX/vo-english/death.meta
	Assets/SFX/vo-english/death/death-1.wav.meta
	Assets/SFX/vo-english/death/death-2.wav.meta
	Assets/SFX/vo-english/death/death-3.wav.meta
	Assets/SFX/vo-english/ident.meta
	Assets/SFX/vo-english/ident/ident-1.wav.meta
	Assets/SFX/vo-english/ident/ident-2.wav.meta
	Assets/SFX/vo-english/ident/ident-3.wav.meta
	Assets/SFX/vo-english/idle.meta
	Assets/SFX/vo-english/idle/idle-1.wav.meta
	Assets/SFX/vo-english/idle/idle-10.wav.meta
	Assets/SFX/vo-english/idle/idle-2.wav.meta
	Assets/SFX/vo-english/idle/idle-3.wav.meta
	Assets/SFX/vo-english/idle/idle-4.wav.meta
	Assets/SFX/vo-english/idle/idle-5.wav.meta
	Assets/SFX/vo-english/idle/idle-6.wav.meta
	Assets/SFX/vo-english/idle/idle-7.wav.meta
	Assets/SFX/vo-english/idle/idle-8.wav.meta
	Assets/SFX/vo-english/idle/idle-9.wav.meta
	Assets/SFX/vo-english/looking.meta
	Assets/SFX/vo-english/looking/look-1.wav.meta
	Assets/SFX/vo-english/looking/look-2.wav.meta
	Assets/SFX/vo-english/looking/look-3.wav.meta
	Assets/SFX/vo-english/looking/look-4.wav.meta
	Assets/SFX/vo-english/looking/look-5.wav.meta
	Assets/SFX/vo-english/looking/look-65.wav.meta
	Assets/SFX/vo-english/male.meta
	Assets/SFX/vo-english/male/grunt-1.wav.meta
	Assets/SFX/vo-english/male/grunt-2.wav.meta
	Assets/SFX/vo-english/male/grunt-3.wav.meta
	Assets/SFX/vo-english/male/grunt-4.wav.meta
	Assets/SFX/vo-english/male/grunt-5.wav.meta
	Assets/SFX/vo-english/male/grunt-6.wav.meta
	Assets/SFX/vo-english/male/sob.wav.meta
	Assets/SFX/vo-irish.meta
	Assets/SFX/vo-irish/attack.meta
	Assets/SFX/vo-irish/attack/attack-1.wav.meta
	Assets/SFX/vo-irish/attack/attack-2.wav.meta
	Assets/SFX/vo-irish/attack/attack-3.wav.meta
	Assets/SFX/vo-irish/attack/attack-4.wav.meta
	Assets/SFX/vo-irish/attack/attack-5.wav.meta
	Assets/SFX/vo-irish/attack/attack-6.wav.meta
	Assets/SFX/vo-irish/attack/attack-7.wav.meta
	Assets/SFX/vo-irish/ident.meta
	Assets/SFX/vo-irish/ident/ident-1.wav.meta
	Assets/SFX/vo-irish/ident/ident-2.wav.meta
	Assets/SFX/vo-irish/ident/ident-3.wav.meta
	Assets/SFX/vo-irish/idle.meta
	Assets/SFX/vo-irish/idle/idle-1.wav.meta
	Assets/SFX/vo-irish/idle/idle-2.wav.meta
	Assets/SFX/vo-irish/idle/idle-3.wav.meta
	Assets/SFX/vo-irish/idle/idle-4.wav.meta
	Assets/SFX/vo-irish/idle/idle-5.wav.meta
	Assets/SFX/vo-irish/idle/idle-6.wav.meta
	Assets/SFX/vo-irish/looking.meta
	Assets/SFX/vo-irish/looking/look-1.wav.meta
	Assets/SFX/vo-irish/looking/look-2.wav.meta
	Assets/SFX/vo-irish/looking/look-3.wav.meta
	Assets/SFX/vo-irish/looking/look-4.wav.meta
	Assets/SFX/vo-irish/looking/look-5.wav.meta