test
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	artificing_common/chrisclark13/minecraft/artificing/client/gui/inventory/GuiResearchTable.java
[Cyntain] Working on the research table. Added all the textures, need to sort the scaling, need to remake the slots. Make the string "Reserach Table" be on two lines, changed the direction of the rings to roate the other way. Also changed some file locations of the times that are not .png