Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dasumlaut/olympia/Olympia.java
	src/main/resources/mcmod.info