(´・ω・｀)
a
Merge remote-tracking branch 'origin/mozipi'

Conflicts:
	src/main/java/mcmmorpggroup/flaggames/FlagManager.java
	target/classes/META-INF/maven/mcmmorpggroup/flaggames/pom.properties
	target/classes/mcmmorpggroup/flaggames/FlagManager.class