resolved merge
resolved merge conflict with upstream master
changed managers preferences in test.rb to be on a 1-5 scale not 1-10
created checks for the skill, weight, and preferences hashes for managers and engineers so they can be checked
Merge pull request #3 from AEgan/egan

Egan