Added calculator app from master