removed csalculator from teacher branch