Changed few things
Merge branch 'master' of https://github.com/MrLarssonJr/FlagHolder

Conflicts:
	FlagHolder/src/insertName/flagHolder/entities/Player.java