support for 2 formatos instead of 3
enhances to navbar
showing floating formato (WIP)
remove unnecessary menu and app helper method
use pry on dev
deep thoughts
Merge remote-tracking branch 'origin/formatos-enhances' into formatos-enhances
cambios pedidos
:notsureif:
allow propagation
Merge branch 'formatos-enhances' of github.com:vilcabamba/quinara into formatos-enhances

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
minor fixes to floating formato
sort `Question.kinds`
Merge branch 'formatos-enhances' of https://github.com/vilcabamba/quinara into formatos-enhances

Conflicts:
	app/models/course.rb
	app/models/evaluacion.rb
	app/views/courses/formato_evaluaciones.html.erb
	app/views/layouts/_navbar.html.erb