committing changes to stats.py
added median function to stats.py
added missing files
fix merging
Merge remote-tracking branch 'beta/master' into median-tests