Changed navbar background color
Resolved conflict issues in CSS
Merge branch 'master' of heroku.com:ycreate