end of week 7 wed - omniauth
merge nav bar