Attempted Bug Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/me/quartzdev/DeathCrystals/config/Config.java