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

....