removed scaffolds css and added a root_path to the logo
merge conflicts