Test merge tool
Merge branch 'master' of https://github.com/tsvetomir-nikolov/QualityCodeTeamProject