work
Merge branch 'master' of www.beautifulwork.org:/var/git/beautifulwork
Merge branch 'master' of www.beautifulwork.org:/var/git/beautifulwork
Merge branch 'master' of https://github.com/ahiliation/beautifulwork
work related
Initial commit
Merge branch 'master' of https://github.com/ahiliation/beautifulwork-project

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