content -first commit
Merge branch 'master' of https://github.com/yarova/Test

Conflicts:
	.idea/workspace.xml
	styles/framework.css