shtuff
fff
Merge branch 'Roger'

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.dll