signup frame
Merge branch 'newcho'

Conflicts:
	bin/.gitignore