Resolving merge conflicts
Merge branch 'master' of https://github.com/danamc16/sinatra.project
Updated versions