Merge pull request #12 from TEAM2-ISC567-FALL14/master

10-31 update from Team 2