pulling
fixed merge conflict
Created and styled sub nav
merge conflict
fixing nav bar
Merge branch 'master' of https://github.com/presidentJFK/Ign
sub nav
Merge branch 'master' of https://github.com/presidentJFK/Ign

pull