more fun times with scss
merged saturday
totally refactored scss, still in need of cleaning
merged