Merge remote-tracking branch 'origin/master' into Cole
Merge remote-tracking branch 'origin/master' into Cole
Merge remote-tracking branch 'origin/master' into Cole
Fixed CircleGroup, set up for upgrades buttons
Upgrade buttons now do stuff, uses circleGroup.  Free atm tho
Upgrades now properly cost gold,
Fixed a bug
merge