Fixing line endings. This shouldn't be an issue if we change our config to use the same line endings.
Merge remote-tracking branch 'origin'

* origin:
  Add required author acknowledgement for the Entypo font and fix errors from merge
  Issue #5 main nav (not finished)
  #6 added design to pagination
  Added initial styles to pagination
  Issue #11 internal sub nav rule

Conflicts:
	scss/_modules.scss