merge feature/calculator-get-user-input to feature/calculator