Added layout and static pages
Resolve conflict in application.html.erb,application_helper.erb