got it working
Merge branch 'master' of github.com:LeviRosol/dsmwebgeeks-cupcakes