no message
Merge branch 'master' of https://github.com/ericaBradford/SquidIncWebsite

Conflicts:
	ClericoDezign_SquidInc/ClericoDezign_SquidInc/ClericoDezign_SquidInc.csproj