Merging
Merge branch 'master' of https://github.com/hahnski07/TrailLockerSwap

Conflicts:
	TrailLocker/App_Data/TrailLocker.mdf
	TrailLocker/Views/Shared/_Layout.cshtml