Merge branch 'master' of D:\Git\BasicJava with conflicts.
Рефакторинг фабрики