ugh
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/mcthunder/MCThunder.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
teleport