backgruond
Merge branch 'master' of https://github.com/diversify/beautiful-world

Conflicts:
	web.py