Add a full_title helper
Added contact page to track.
updated readme, new push
Fix merge conflicts. Update test files.
Update angela branch.
Layouts and routes done -CK
Finish layout and routes
Merge remote-tracking branch 'origin' into ChrisK

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/application.rb
	config/routes.rb
	spec/requests/static_pages_spec.rb
merged from origin