Added some styles to navigation bar and added web fonts.
Fixed merge conflict.