Moving amy to beta
Merge branch 'master' of github.com:amstars/blue-diamond-awards

Conflicts:
	source/CNAME