worked on in class
Merge branch 'gh-pages' of github.com:alextaoultsides/twocupcakesbakery into gh-pages