client side integration started
client side integration started_
Merge branch 'master' of https://github.com/mindm/Shooterception

Conflicts:
	Client/main.c
	Client/player2.gif
	Client/player3.gif
	Client/player4.gif
	gameLogic.c
	gameLogic.h
	generic.h
	networking/networking_server.c
	networking/networking_server.h
	networking/packets.h

Merged conflicting files