added a placeholder median function, needs to be replaced
Reset for a new bootcamp 2014-01
Fixing mean to behave correctly for floats.
Merge remote-tracking branch 'upstream/master'