Updated pom.xml
Merge branch 'master' of https://github.com/Amperage/Ruin.git

Conflicts:
	src/main/java/ruin/server/Ruin.java