adding stuff
Merge branch 'master' of https://github.com/laforge38/jordantestrepro