test commit 2
cleaned dirs
Merge branch 'master' of https://github.com/MrFlark/Battlefield-4

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.history/10/60396f0c1edd0013154cbce00fccec03
	.metadata/.plugins/org.eclipse.core.resources/.history/2c/105ab2b618de00131508f9b59276ba91
	.metadata/.plugins/org.eclipse.core.resources/.history/3c/d05e484d5bdc00131566daccbe475676
	.metadata/.plugins/org.eclipse.core.resources/.history/54/c020baed4fdd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/59/20bfa7471edd0013154cbce00fccec03
	.metadata/.plugins/org.eclipse.core.resources/.history/61/f05ef6475bdc00131566daccbe475676
	.metadata/.plugins/org.eclipse.core.resources/.history/68/d05359e84fdd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/7/00f2ffd118de00131508f9b59276ba91
	.metadata/.plugins/org.eclipse.core.resources/.history/80/c0f1b1b018de00131508f9b59276ba91
	.metadata/.plugins/org.eclipse.core.resources/.history/8a/f0c7fdfa5adc00131566daccbe475676
	.metadata/.plugins/org.eclipse.core.resources/.history/91/f08a4b581edd0013154cbce00fccec03
	.metadata/.plugins/org.eclipse.core.resources/.history/a/f055aaa650dd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/ad/d0daf4f21ddd0013154cbce00fccec03
	.metadata/.plugins/org.eclipse.core.resources/.history/b2/70cc276050dd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/d6/70a7e86e50dd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/e1/600e890450dd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/e5/80f0475c5bdc00131566daccbe475676
	.metadata/.plugins/org.eclipse.core.resources/.history/e9/b0ec19cd4fdd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.history/f2/40d645d74fdd00131588bad7df2f961c
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/7/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/e4/3/6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/e4/3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/e4/61/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/e4/d9/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.indexes/e4/f2/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Client/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.indexes/e4/2e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.indexes/e4/62/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.indexes/e4/8b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Server/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/137624701.index
	.metadata/.plugins/org.eclipse.jdt.core/2501520862.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Client/bin/.gitignore
	Client/bin/Entity/Enemies/Slugger.class
	Client/bin/Entity/Player.class
	Client/bin/Main/Game.class
	Client/src/Entity/Enemies/Player2.java
	Client/src/Entity/Enemies/Slugger.java
	Client/src/Entity/Player.java
	Client/src/GameState/MPState.java
	Client/src/Main/Game.java
	Client/src/Main/Threading.java
	Server/bin/network/Host.class
	Server/bin/start/Main.class
	Server/bin/start/Threading.class
	Server/src/network/Host.java
	Server/src/start/Threading.java