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

Conflicts:
	Client/bin/Audio/AudioPlayer.class
	Client/bin/Entity/Animation.class
	Client/bin/Entity/Enemies/Slugger.class
	Client/bin/Entity/Enemy.class
	Client/bin/Entity/Explosion.class
	Client/bin/Entity/FireBall.class
	Client/bin/Entity/HUD.class
	Client/bin/Entity/MapObject.class
	Client/bin/Entity/Player.class
	Client/bin/GameState/GameState.class
	Client/bin/GameState/GameStateManager.class
	Client/bin/GameState/Level1State.class
	Client/bin/GameState/MenuState.class
	Client/bin/Main/Game.class
	Client/bin/Main/GamePanel.class
	Client/bin/TileMap/Background.class
	Client/bin/TileMap/Tile.class
	Client/bin/TileMap/TileMap.class
	Client/src/network/Connection.java
	Server/bin/network/Host.class
	Server/bin/start/Main.class