Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

.gitignore

Gemfile

Gemfile.lock

analise

app/assets/images/cc.png

app/assets/images/colecoes.png

app/assets/images/decrease_font.ico

app/assets/images/geral.png

app/assets/images/geral_acessos.png

app/assets/images/geral_colecoes.png

app/assets/images/geral_download.png

app/assets/images/geral_user.png

app/assets/images/increase_font.ico

app/assets/images/iros.jpg

app/assets/images/logo.png

app/assets/images/mecshow_logo.jpg

app/assets/images/test.png

app/assets/images/usuarios.png

app/assets/javascripts/application.js

app/assets/stylesheets/application.css