ver_1.0
Merge pull request #2 from Barbados22/progr1

ver_2.0