tests updated
final Falling Tests update
Fixed merge conflix
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject