added username to user table
changed functionality for devise to use username and email
changed file user.rb to work properly