repaired
[unfinished] added calculatePony class
Merge branch 'master' of
https://github.com/laytraining/gittraining-sample.git

Conflicts:
	org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Multiply.java
Merge remote-tracking branch 'origin/master'