change unordered arraylists to hashsets
fix merge
Merge branch 'graphic' of https://github.com/jpascale/RPG into graphic