final add
Merge branch 'master' of https://github.com/mikeycattell/Portfolio

Conflicts:
	michaelcattell/assets/css/component.min.css
	michaelcattell/templates/includes/navigation.liquid
	michaelcattell/templates/index.liquid