final edits
What was turned in
Merge github.com:brushstrokefox24/Project1
turned in