html changed
Merge branch 'new_branch' of https://github.com/ZakharDolozhevskiy/water_gate into new_branch
conflict denied