Merge branch 'skills'

Conflicts:
	src/main/java/net/dawnfirerealms/legends/core/LPlayer.java
Merge branch 'yaml-loading'

Conflicts:
	src/main/java/net/dawnfirerealms/legends/core/LPlayer.java