declaracao aproveitamento
ignore esse commit
Merge branch 'dev_thiago' of https://github.com/thiagorpp/viamundi into guided_tour

Conflicts:
	app/assets/javascripts/application.js
	app/views/home/_menu.html.haml
	app/views/students/_form.html.haml
	app/views/students/show.html.haml
inclusão de pdfs e alteração dos models necessários
geração de pdf para atestado de matricula
gerador de contratos
Merge branch 'dev_thiago' of https://github.com/thiagorpp/viamundi into guided_tour

Conflicts:
	app/controllers/grades_controller.rb
	app/views/grades/show_student.html.haml
	app/views/students/show.html.haml
redução de espaçamento
layout search
fixing merge