figuring out sinatra conflicts
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday
trying to figure out json
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday
stuck
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday