Merge branch 'Roger'
Merge branch 'Roger'
Trying to get published
Merge branch 'Roger'

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.dll
Merge branch 'master' into Roger