package.json changes being committed. i forget what these changes were, but i'm trying to merge.
Merge remote-tracking branch 'upstream/master'
Somewhat more responsive navbar.
Changed default protocol to http
Fixed a few typos
(From aborted subdomain-to-route migration)