fixed type mismatch on a unit test
Merge branch 'master' of https://github.com/TrentF/Bootcamp-Final-Project
Merge branch 'master' of https://github.com/TrentF/Bootcamp-Final-Project
Merge branch 'master' of https://github.com/TrentF/Bootcamp-Final-Project
todays code changes - test
Merge branch 'master' of https://github.com/TrentF/Bootcamp-Final-Project
D