set viewport
created navbar
fixed merge conflicts
renamed custom.css