made money capacity class
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/kevintyang/codeclicker/codeclicker/CapacityUpgrades.java