latest
Merge branch 'master' into individual_docs

Conflicts:
	send_card_scraper.rb
	trade.txt
Removed generated and clean up