update2
k
h
Merge branch 'master' of https://github.com/zusamania/IM

Conflicts:
	Codecamp/GameRules.xaml.cs