- Adding images beside expandable columns
Merge branch 'master' of https://github.com/InfusionRaleighEvent/more_cowbell

Conflicts:
	TechJam/Content/css/MasterStyles.css
	TechJam/TechJam.csproj