web config
nothing
Merge branch 'master' of https://github.com/JoshuaKaminsky/PhotographySite.git

Conflicts:
	PhotographySite.Web/Web.config
update entities