fixed nam es and linda
Merge branch 'master' of https://github.com/Supernova-Team/hate