Merge branch 'master' into Dustin
cleaned up styling on accessories
Merge branch 'Dustin'
Merge branch 'master' into marty