Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add textured background
fix merge conflict
Merge remote-tracking branch 'upstream/master'
cart box added on indiv product page
fix indiv product page
fix merge conflicts
solve merge conflict
fix merge conflict
meow
Merge pull request #10 from earlgreyco/master

pull my hair forrealz this time