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

Conflicts:
	backup/README.md
	wp-content/themes/lean/index.php
Merge branch 'master' of www.beautifulwork.org:/var/git/beautifulwork

Conflicts:
	backup/README.md
	wp-content/themes/lean/index.php
work
work