Merge branch 'master' into per
Updated quantity concern
new app icon
Merge branch 'per' of https://github.com/zzzj15/senior_design into jing
merge app.