add gold
Merge remote-tracking branch 'origin/master' into playergold
Merge remote-tracking branch 'origin/master' into playergold
add gold increase
fix conflict