Added html header includes and profile settings pages
Added includes directory to separate includes from scripts
pulling includes
fixed merge conflicts