added spendResources
Movement of the canon
Merge remote-tracking branch 'origin/master'