Add controller method for assigning cards, and add lifecycle method for placement phase
Fix conflict
Merge pull request #4 from ethansr/merchant_event

Add controller method for assigning cards, and add lifecycle method for ...