Working on it. finally.
Merge branch 'master' of https://github.com/Quartzcraft/QuartzKingdoms

Conflicts:
	src/uk/co/quartzcraft/kingdoms/QuartzKingdoms.java