TEAM2-ISC567-FALL14/ISC567Fall2014 — pull request #9 by sigiltempus (2014-11-09 22:07:24+00:00)
Title: Merge pull request #14 from TEAM2-ISC567-FALL14/master

Update - correct inherit error