Added standard deviation
fixed conflicts
Merge branch 'jduga002-master'

fixed conflicts