git and github

• Added Person.java with constructors/getters/setters
• Added Calculator.java with add, subtract, multiply, divide
• Created and merged PR with conflict resolution ( step not completed)
• Final deliverable for assignment