procrastination ...
Merge branch 'master' of https://github.com/Adri22/RPG

Conflicts:
	.gitignore
some stuff ...