DIST
working on padding/spacing
Merge branch 'master' of git://github.com/johnshopkins/machado

Conflicts:
	dist/css/main.css
	dist/css/main.css.map
	dist/js/home.js
	dist/js/page.js
	src/assets/css/modules/homepage-why-hopkins.scss
	src/assets/css/modules/main-nav.scss
Merge branch 'master' of git://github.com/johnshopkins/machado

Conflicts:
	dist/css/main.css
	dist/css/main.css.map
	dist/js/home.js
	dist/js/page.js
	src/assets/css/modules/homepage-why-hopkins.scss
	src/assets/css/modules/main-nav.scss