Should Work in Simulation Now
resolved merge conflict
Merge branch 'master' of github.com:jsmonson/FinalProject620