fixing various warnings
Merge branch 'master' of https://github.com/zsweedyk/CS121F14S3_Team3

Conflicts:
	SilkRoad.xcodeproj/project.pbxproj