updated bg
Merge branch 'master' of https://github.com/totaljs/website

Conflicts:
	public/img/bg.jpg