Merge branch 'master' of https://github.com/CustomCupcakes/Custom-Cupcakes into Greg
Merge branch 'master' of https://github.com/CustomCupcakes/Custom-Cupcakes into Greg
Added database modelin .dia and .png formats
Merge branch 'Greg' of https://github.com/CustomCupcakes/Custom-Cupcakes