added confirmation email message displayed
deleted no useful puts from user controller
added confirmation email message
conflicts fixed