Merge updated
class diagram updated
Merge pull request #3 from alxnek/DevelopmentAlex

Development alex