A few updates
Merge branch 'master' of https://github.com/alexandrebouchard/stat302-web-fa2014-15