Changed input function.
Merge pull request #37 from EthanGarrison/calculator

Changed input function.