Added the beginnings of Energerium and Elidyrum Ore.
Merge remote-tracking branch 'origin/master'

Conflicts:
	PersonalEnergy.iml
	PersonalEnergy.iws
	build.gradle
Added the beginnings of Energerium and Elidyrum Ore.