signup_app
Merge branch 'master' of https://github.com/maisaengineering/signup_app

Conflicts:
	app/views/signup/new.html.erb~