-
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
+ change slider in homework_Unit1