added custom css file
made header footer shim
fixed merge conflicts