forgot the assembly file change
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bocce/Properties/AssemblyInfo.cs