attempting to fix migrations
Merge branch 'master' of https://github.com/sliplow/LisaChowArtwork

Conflicts:
	LisaChowArtwork/App_Data/LisaChowArtwork-Artwork.mdf
	LisaChowArtwork/App_Data/LisaChowArtwork-Artwork_log.ldf