Merge branch 'static_template_creation' of https://github.com/kenballard/NuthinButNet into Develop
Merge branch 'static_template_creation' of https://github.com/kenballard/NuthinButNet into Develop
Attempt to ignore App_Data folder
Try again
Added preliminary blog landing page
Added blank blog details page
Merge remote-tracking branch 'origin/static_template_creation' into Aaron
Added content to BlogDetail page
Adding Event Landing and Venue Landing
added first cropped images
First go at Events List
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
updating branch
added more pics
added more pics
additional files
Simplifying events macro - adding more property references
Merge branch 'Develop' into ben

Conflicts:
	NuthinButNet/NuthinButNet/App_Data/Logs/UmbracoTraceLog.txt
	NuthinButNet/NuthinButNet/App_Data/TEMP/ExamineIndexes/External/Index/segments.gen
	NuthinButNet/NuthinButNet/App_Data/TEMP/ExamineIndexes/Internal/Index/segments.gen
	NuthinButNet/NuthinButNet/App_Data/umbraco.config
	NuthinButNet/NuthinButNet/NuthinButNet.csproj
Merge remote-tracking branch 'origin/brian' into Develop
added images to CMS
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
Merge commit '8917ce86b267dd7fd84e720a978dd183a3e5865f' into home-page