news
Merge branch 'master' of https://github.com/dex3r/TheMinecraft.git

Conflicts:
	minecraft/dex3r/main/factions/Faction.java