removed jasmine
nav bar styling and home page text
fixed merge conflict
fix merge conflict