damnit conji
Merge remote-tracking branch 'origin/master'

Conflicts:
	CarbsAlleviateHunger/CarbsAlleviateHunger/App_Data/black_cards.json
	CarbsAlleviateHunger/CarbsAlleviateHunger/App_Data/white_cards.json