beta changes
Merge branch 'master' of https://github.com/timcullen/MojoPromo

Conflicts:
	help.html
beta(2)