rearranges file structure
Merge branch 'master' of https://github.com/coreybruyere/530-framework

Conflicts:
	stylesheets/utilities/_helpers.scss