deleted line from merge conflict
Merge branch 'master' of https://github.com/djrival7/DatabaseProject1Part3-djw2146-ec2805