Created listed_card and trade models
Updated card and user models
Updated views to add cards to wanted and trade list
Just some test files for the trade and listed_card models
Merge branch 'master' of github.com:pschwyter/mtg_json_api

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
	db/schema.rb
Fixed merge conflict in sessions controller and schema