Merge branch 'models_and_controllers' of https://github.com/joshua5201/tioj into newFlatCss

Conflicts:
	app/views/layouts/application.html.erb
problem->show update
finish main part of problem show
show.erb update
pull show.html.erb
floating menu in problems/show