started working on turning wishlist and tradebinder into tables(user/show). also started the process of importing mana images for display.
pull for form formatting
merging before form
finished mana display. Used parsing method that creates image links to each mana img
Merge branch 'master' of github.com:pschwyter/mtg_json_api into wishandtradelisttable

Conflicts:
	app/assets/stylesheets/application.css
	app/views/users/show.html.erb

merge with my branch....updated mana images to display properly
added propose trade, search cards nearby, and a link to show the card....none of these work yet :(
fixed merge conflict
Merge branch 'master' of github.com:pschwyter/mtg_json_api into wishandtradelisttable

merged branch with eric's fix for current_user image display bug
replaced mana letters with images in the card search form
added card links to user wishlist...not working yet
Merge branch 'wishandtradelisttable'

 merging my trade binder/wishlist styling branch with the master
prepping branch master merge with phil's trade updates
Merge branch 'master' of github.com:pschwyter/mtg_json_api

Re: merge with phil's master trade branch