nav bar and home page div
resolved conflicts wtih shannons branch