networking stuff

set player type and things
fixed merge conflicts
Merge branch 'master' of https://github.com/ayarger/mhacks4

Conflicts:
	Mhacks_2014.gmx/Mhacks_2014.project.gmx
	Mhacks_2014.gmx/objects/oController.object.gmx
fixed merge?