Merge branch 'ms1-integration' into general
Bool fixes
If player floor incorrect, now shows player number in error message
Logic checks update for different types
Changed code so that packet 11 (all player pos update) will only be sent
when a ptype 11 is received through ipc sockets
Added update on tick
Major rebuild started
Still to do:
- New Connection
- Lost Connection
- TEST!!!
Added endController and framework for the connectionController
connectionController now takesin the incoming packet_t
Fleshed out the connection controller - still need to trigger a game end check if the last player from a team was dropped
typos - now compiles - TEST ME!!
numPlayers implementation will need to actually count the players
Merge branch 'general' into ms2-integration

Conflicts:
	src/GeneralController.c
Merge branch 'gameplay' into ms2-integration

Conflicts:
	src/GameplayController.c
	src/InboundSwitchboard.c
	src/Server.h
	src/Startup.c
Win condition triggered on player lost
Upgraded DEBUG macro
Removed over-sending of packet 11
added player count
Merge remote-tracking branch 'origin/ms2-integration' into general

Conflicts:
	src/GeneralController.c
fixed sockets, added comments