Initial commit
Initial commit
Initial commit
Initial commit
Initial commit
Initial commit
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Client/src/me/SurvivalGame/Client/Handlers/CameraHandler.java
	Client/src/me/SurvivalGame/Client/Handlers/InputHandler.java
	Client/src/me/SurvivalGame/Client/Handlers/LogHandler.java
	Client/src/me/SurvivalGame/Client/Handlers/PlayerHandler.java
	Server/src/me/SurvivalGame/Server/LogHandler.java