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

Update - correct inherit error