Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
adding files
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
program subprogram template
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into Develop
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into Develop
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into brian
merge blog listing page w/ view
blog
blog merge
blog banners
Merge branch 'Develop' of https://github.com/kenballard/NuthinButNet into Develop
Featured events module headlines
removed login and search dialog
Staff Landing page now has a new row every 3 people
Merge branch 'Develop' into ben

Conflicts:
	NuthinButNet/NuthinButNet/NuthinButNet.csproj
Merge branch 'Aaron' into Develop