resolved a name duplicate in windows
Merge branch 'master' of https://github.com/radkokotev/GU_LVL3_TEAM_R_13-14
back to normal naming