testing merge push
added code to the mean function
adding the mean function
Merge branch 'master' of https://github.com/hertizonical/scipy-2013-git-testing