application helper full_title added
updated conflicts
updated static_pages view template
added extra line to template