first commit
Merge https://github.com/fcole90/PR1-Calculator