Resolving merge issues
Merge branch 'master' of https://github.com/danamc16/sinatra.project
Finished name editing function