GUI changed
GUI & ItemCard changed conflits fixed
GUI & ItemCard changed conflits fixed & new files added