merge
fix quantity blow up
merge
Merge pull request #176 from allisonlarson/new_bug_squah

New bug squah