merge calculator in dev

A good place for staticmethod. Instead of creating a Calculator() instance, just call calculator.average().