pulling down
stuff
fixed some errors in merge conflict with absolute div in style.css
fix
merge