removed header
 started doing some html stuff
 fixed merge conflicts