first commit
Resolving merge conflicts
Resolving merge conflicts
Merge branch 'wonky' of https://github.com/danamc16/sinatra.project