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

Conflicts:
	.idea/workspace.xml
-
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
1
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
	homework_Unit2/app/index.html
-
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
-
-
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
-
Merge branch 'master' of https://github.com/mspanfilov/modernwebdevelopment.git

Conflicts:
	.idea/workspace.xml
+ homework_Unit6 v.0