Merge pull request #1 from dancarter/dan

Initial commit for new branch
user stories and company class
fix company
Merge pull request #2 from dancarter/dan

Dan merge
Edited error in salespeople classes
Merge