adjusted the styles of the app
Merge branch 'master' of github.com:shawnhanna/cs1635-shopping-app
Merge branch 'master' of github.com:shawnhanna/cs1635-shopping-app
Change before merge
Merged.  Also, updated some image buttons