sdadsad
Merge branch 'master' of https://github.com/Aleksandrova/html

Conflicts:
	static/css/style.css