working on non responsive drop down
working through merge conflicts
fixed css form size bug that's messing up home page-need to find a different solution for form width
modifying nav-bar
re-fixed list to not have bullets
fixed merge conflicts