Pushed in a lot of base files to pull in foundation and have the basic structure of the nav in place
fix merge conflict