Team one fixes
cascade fix
Merge pull request #28 from TEAM2-ISC567-FALL14/master

Team one fixes