fix merge

app/assets/images/fnde.png

app/assets/images/icons/downloadred.png

app/assets/images/icons/foldergreen.png

app/assets/images/icons/signup.png

app/assets/images/logo_brasil.png

app/assets/images/logo_ministerio.png

app/assets/javascripts/application/accessibility.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/views/devise/sessions/new.html.erb

app/views/learning_objects/show.html.erb

app/views/shared/application/_footer.html.erb

app/views/welcome/account.html.erb

app/views/welcome/add_file.html.erb

app/views/welcome/collection.html.erb

app/views/welcome/index.html.erb

config/locales/pt-BR.yml

config/routes.rb