started programs page
develop branch merge
Setup Board template.
Merge branch 'Develop' into static_template_creation
update layout to remove boilerplate
Merge branch 'static_template_creation' of github.com:kenballard/NuthinButNet into static_template_creation
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
Added partner, staff, nav links
Try again
Merge branch 'static_template_creation' of https://github.com/kenballard/NuthinButNet into static_template_creation

# By Ben Liset (2) and others
# Via Kyle Sowards (3) and Ben Liset (1)
* 'static_template_creation' of https://github.com/kenballard/NuthinButNet:
  update layout to remove boilerplate
  Navigation menu implemented
  Implemented basic carousel for Home Page
  Pointing templates to layout
removing app data garbage
Merge remote-tracking branch 'origin/static_template_creation' into Aaron
Added content to BlogDetail page
Adding Event Landing and Venue Landing
First go at Events List
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