fix solution name error
Merge branch 'master' of https://github.com/kirkchen/AmazingCalculator

Conflicts: