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

Update - correct inherit error
UI corrections as per client feedback
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014.git
Merge pull request #9 from eas604/master

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