contact done
add a full_title helper
add a full_title helper
Merge branch 'master' into filling-in-layout

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	spec/requests/static_pages_spec.rb
Revert "Merge branch 'master' into filling-in-layout"

This reverts commit 930fcd8f07737ddccaf0edc0911a1ff923e2b851.
Revert "Revert "Merge branch 'master' into filling-in-layout""

This reverts commit cba6b7247b30ad491e3fb849ee407d67a4640ccb.
end of 5 glava
before merge