Finished OR and updated Test Script
Merge branch 'master' of github.com:TylerGillson/Data-Management