Merge remote-tracking branch 'origin/master'

Conflicts:
	sign-up.html