yy
Merge branch 'master' of https://github.com/whyvine/shichajob

Conflicts:
	app/views/shichajob/signup.html.erb
	app/views/shichajob/welcome.html.erb
new
Merge branch 'master' of https://github.com/whyvine/shichajob
error newpassword