Implemented two-line calculator

moved display code back to PM
typo in readme
Implemented Waiting state

Implemented error handling
now has better error recovery too