Merge branch 'josh's-branch'
Merge branch 'josh's-branch'
Added test for complex purchase

 - Added a test to check the functionality of buying several units and
ensuring the player's cash and inventory has been updated
Merge branch 'master' into josh's-branch