fixed issue with yield nested inside top nav div on welcome page
Merge pull request #28 from mkirlin/conflict-resolution

fixed issue with yield nested inside top nav div on welcome page