Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Fixed up all of Gameplay source files, now is much more readable.
Removed all unneccesary folders/files (obj, bin, makefile).
Reduced amount of code in movement_system and collision_system.
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
Added map 3
Merge remote-tracking branch 'origin/loltesting_samsstuff' into LOLTESTING
Merge branch 'LOLTESTING' of github.com:DComm2013Network/CutThePower into LOLTESTING
Fixed a number of things.
Merge branch 'loltesting_samsstuff' into LOLTESTING
Merge branch 'loltesting_samsstuff' into LOLTESTING
Changed client_update_chat to zero all elements of the array first
Merge branch 'Gameplay' into LOLTESTING

Conflicts:
	Makefile
	assets/Graphics/map/map_00/map00.txt
	assets/Graphics/map/map_00/tiles.txt
	assets/Graphics/map/map_03/20_40px.bmp
	assets/Graphics/map/map_03/tiles.txt
	src/Gameplay/collision.h
	src/Gameplay/collision_system.cpp
	src/Gameplay/movement_system.cpp
	src/Gameplay/systems.h
	src/Graphics/map.cpp
	src/Graphics/map.h
	src/Input/chat.cpp
	src/Input/chat.h
	src/Network/ClientUpdateSystem.cpp
	src/Network/GameplayCommunication.cpp
	src/Network/NetworkRouter.cpp
	src/Network/NetworkRouter.h
	src/Network/Packets.h
	src/Network/SendSystem.cpp
	src/main.cpp
	src/triggered.cpp
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
NEW COP
Merge branch 'LOLTESTING' of github.com:DComm2013Network/CutThePower into LOLTESTING
Merge branch 'LOLTESTING' of github.com:DComm2013Network/CutThePower into LOLTESTING
Made it faster so these retards can stop complaining.