added buttons for add joke and email joke
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday
Merge branch 'master' of https://github.com/techtolentino/jokeoftheday
we are about to test command line code and rspec tests and we just ate a bomb ass sandwich from Planet Sub
fixed merge conflicts, I hope