Weekly status report for 10/31/14: Jonathan Nix
Merge branch 'master' of https://github.com/jtkilleen/14F_CS374_Team4