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

Conflicts:
	partials/home.html
	static/css/pages.css