Commit message
Merge branch 'master' of https://github.com/Plugins-/RPG-plugin-

Conflicts:
	.gitignore