added kaminari gem for pagination. included pagination functionality for index and search actions in cardsController
Merge branch 'paginationimplementation'

Conflicts:
	app/views/cards/_card_display.html.erb

fixed merge conflict resulting from kaminari implementation...white spacing in _card_display partial
Merge branch 'master' of github.com:pschwyter/mtg_json_api

merge resulting from kaminari implementation
Created trades show page and made relevant check boxes active by default on edit trade view
Created update and show actions in trades controller
Merge branch 'master' of github.com:pschwyter/mtg_json_api into trades_feature