fixed my name ETHANgit status
Merge branch 'dev' of https://github.com/the-hobbes/softwareEngineeringProject1 into dev
fixed merge conflict between pdf versions
pushing png for ethan
fixed merge conflict
Merge branch 'dev' of https://github.com/the-hobbes/softwareEngineeringProject1 into dev
fixed minor issue with a newline in the help display
presentation merge