added bank trade button and hexes can be clicked for robber
added bank trade button and hexes can be clicked for robber
Fixed conflicts
Still fixing conflicts