experience and leveling
merge experience and leveling changes
clean up files
clean up merge conflicts
clean up merge conflicts
add skill class