Changing class variable
Merge branch 'development' of github.com:KateOl/it-school into development
Src folder was relocated
Src folder was relocated
Merge pull request #5 from KateOl/fix2

Fix2
Dictaphone classes were updated
Dictaphone classes were updared
Merge pull request #6 from KateOl/fix3

Dictaphone classes were updated
Merge pull request #7 from KateOl/fix4

Dictaphone classes were updared
Class diagram was added
Dictaphone classes were updated
Conflict branch
Merge pull request #9 from KateOl/conflict

Conflict branch
Merge branch 'development' into fix5

Conflicts:
	dictaphone/src/org/oleynik/ekaterina/dictaphone/Battery.java
Merge pull request #10 from KateOl/fix5

Fix5
Merge pull request #8 from KateOl/development

Merge development and master.