reestablish jack_branch
Merge pull request #3 from dandydanny/jack_branch

reestablish jack_branch
Resolving conflicts
Adding stuff
Merge branch 'Daniel-branch' of https://github.com/dandydanny/rspec_pizzaria into Daniel-branch