start new branch
pull
Merge branch 'newFlatCss' of github.com:joshua5201/tioj into models_and_controllers

Conflicts:
	app/views/layouts/application.html.erb
pull
get application.html.erb from newFlatCss
add new_columns_to_problems
Merge branch 'models_and_controllers' of https://github.com/joshua5201/tioj into newFlatCss

Conflicts:
	app/views/layouts/application.html.erb
problem->show update