calculator and app
Merge branch 'master' of https://github.com/jvera004/Course_Work