Add all assets to repository (oops)
Merge branch 'master' of https://github.com/TrainerGuy22/TheRift

Conflicts:
	src/minecraft/dragonborn/rift/config/Items.java
	src/minecraft/dragonborn/rift/config/Recipes.java
	src/minecraft/dragonborn/rift/item/ItemDragonscaleAxe.java
	src/minecraft/dragonborn/rift/item/ItemDragonscaleHoe.java
	src/minecraft/dragonborn/rift/item/ItemDragonscalePickaxe.java
	src/minecraft/dragonborn/rift/item/ItemDragonscaleShovel.java
	src/minecraft/dragonborn/rift/item/ItemDragonscaleSword.java