Generate a short description for dwarves
Try to solve my mergin error
Merge branch 'NPC-Description' into Master

Conflicts:
	css/styles.css
	index.html
	js/script.js