Accidentally took a client .h with me. whoops
Merge branch 'master' of https://github.com/rnrobson/game440_01_2014

Conflicts:
	New Implementation/ManaCraft/ManaCraft.vcxproj.filters