new version
Merge branch 'master' of github.com:Kajo0/BD2