[Cyntain] Fixed a github problem?
deisenhanter gui
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	artificing_common/chrisclark13/minecraft/artificing/item/ItemGuideBook.java