Comment updated
Conflicts resolved
Merge branch 'master' of https://github.com/STzvetkov/KingSurvival5.git