rolling weapons code
Merge branch 'master' of https://github.com/HernanRivasAcosta/rpg_weapon_roller

Conflicts:
	include/name_list.txt