work
Merge branch 'master' of https://github.com/ahiliation/beautifulwork-project

Conflicts:
	wp-content/themes/lean/static/css/lean.css