Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/bedrockmine/main/Main.java
Stuff