creating charts
resolving conflicts
Merge pull request #12 from alexivanov84/branch#3

Branch#3