sem06 stuff
Merge branch 'master' of https://github.com/scottdbrown/stat540-2014-brown-scott