changes
changes from feature branch
image
local links redone, added media query menu
conflict