Feature 2.5 done
Merge branch 'master' of https://github.com/rafaelvalle/stats215a