reorganizing the scss files
Merge branch 'master' of https://github.com/bewoldt/_starter_files

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>

Conflicts:
	css/master.css