In class exercise

Fixed merge issue with calc_stddev.py.