fixed some thangz
fixed stuff
Merge pull request #45 from ansleyjones/ansleysass

Ansleysass
fixed merge conflict