sk1
Merge branch 'master' of https://github.com/zusamania/IM

Conflicts:
	Codecamp/Codecamp.csproj