Added Coin class for the scales/currency minigame
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S3_Team3

Conflicts:
	.DS_Store
	SilkRoad.xcodeproj/project.xcworkspace/xcshareddata/SilkRoad.xccheckout
Fixing conflicts