yet another fix to intellij derping
blah!
test commit from intelliJ
ok, im neveruseing anything but this from now on
worked on the drill and some other gui stuff
Merge branch 'origin/master'

Conflicts:
	.classpath
	.gitignore
	Artificer's Design-1.7.2-BETA.jar
	gradle/wrapper/gradle-wrapper.properties