Signed-off-by: minik <dominik.wojnar@gmail.com>
Signed-off-by: minik <dominik.wojnar@gmail.com>
Merge branch 'master' of https://github.com/rsegeda/Game_2015-Stable
Merge branch 'master' of https://github.com/rsegeda/Game_2015-Stable

Conflicts:
	bin/DBManager.class
	bin/Player.class
	bin/Position.class
	bin/Reader.class
	bin/Server.class
	bin/SerwerHTTP.class
	bin/Utilities.class
	bin/parserHTTP.class
Merge branch 'master' of https://github.com/rsegeda/Game_2015-Stable

Conflicts:
	bin/DBManager.class
	bin/Player.class
	bin/Position.class
	bin/Reader.class
	bin/Server.class
	bin/SerwerHTTP.class
	bin/Utilities.class
	bin/parserHTTP.class