rename signup-1-7
signup-2
signup-3-*
signup 4 + 5
Merge branch 'master' of github.com:oasis55/tmp

Conflicts:
	css/main.css
	less/main.less