Updated style, added back functionality
using ji's version
merging Ji's updates
syncing with upstream
Merge branch 'master' of github.com:cs545/smartphone-store-checkout

Merging changes