Added Scaffolding
Josh's changes
Fix merge conflicts
fix merge conflicts
rawr
Merge branch 'master' of https://github.com/JoshuaKaminsky/PhotographySite

Conflicts:
	Photography.Data/Entities/AlbumEntity.cs
	PhotographySite.Web/packages.config

Trying to merge