company summary working
Merge branch 'companyInfo' of github.com:tadaya/cardMe into tadaya-companyInfo

Conflicts:
	app/assets/javascripts/cards.js
	app/controllers/cards_controller.rb
Merge branch 'master' of github.com:NicholasJay/cardMe