hot fix
Merge branch 'master' of https://github.com/Qvatra/Zinsonland

Conflicts:
	Assets/Scripts/soldier01script.js