Maybe fixed something...
More commits
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/io/github/BmanSlayer1/CommandsP/Events/EventPlayerJoin.java

	target/classes/io/github/BmanSlayer1/CommandsP/Commands/CommandTeleport.class

	target/classes/io/github/BmanSlayer1/CommandsP/Events/EventPlayerJoin.class