Merge pull request #34 from seavor/polina

hopeful merge fix
Merge pull request #35 from seavor/polina

Yet another merge issue fix
item/option pages complete
Merge pull request #36 from seavor/jay

item/option pages complete
moved quantity functions to QuantityCtrl
Merge pull request #37 from seavor/jay

moved quantity functions to QuantityCtrl
standardize buttons from <input> to <button>
Merge pull request #38 from seavor/jay

standardize buttons from <input> to <button>
lay out edit item flow
Merge pull request #39 from seavor/jay

lay out edit item flow
hand-off to polina
Merge pull request #40 from seavor/jay

hand-off to polina
Review page linking to items + pre-populating option popups