Added initiator_cards and receiver_cards attributes to Trade model
Fixed typo in Trade model and added default values to cards arrays
Generated Comment model
Added content field to Comment model, built Comment associations to User and Trade
Adding index and show actions to routes and Cards controller
Ignoring JSON data used for seeding DB
Merge remote-tracking branch 'bruno/master'
Rudimentary search function working
Moved search function to own method, can search by cmc with comparison operators
Moved search form into partial
Can search by Artist
Merge branch 'master' of github.com:pschwyter/mtg_json_api
Merge branch 'cards_search'

Conflicts:
	config/routes.rb