Merge branch 'master' into Dustin
changing shingles accessories reset
Merge branch 'Dustin'
Merge branch 'master' into marty