Adding angular calculator app
manual merge