resolve conflict
Merge branch 'master' of https://github.com/FeiyuYin/cmpe273labCalculator