added initial calculator state to cancel function and fixed app.css syntax error
fixed merge conflicts