Telling Git to ignore my proj settings.
Merge branch 'master' of https://github.com/haveblue/MerchantGame
New Icon Idea.
Merge branch 'master' of https://github.com/haveblue/MerchantGame

Conflicts:
	Merchant Game.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/haveblue/MerchantGame