- test
Merge branch 'feature/redesign' of https://github.com/lincolnloop/threads into feature/redesign

Conflicts:
	client/app/components/Footer.jsx
	client/app/components/Header.jsx
	client/sass/components/_nav-bottom.scss
	client/sass/components/_nav-top.scss