[VP, TP] {test before code} addition calc

tests the calculator with a simple addition
[VP, TP] {story} calculator

implemented the calculator
solve conflicts

Conflicts:

	NokiaPhoneSimulatorTest/src/com/example/nokiaphonesimulator/test/AllTests.java

	NokiaPhoneSimulatorTest/src/com/example/nokiaphonesimulator/test/ContactTest.java