cards controller update
Merge branch 'master' of github.com:NicholasJay/cardMe into companyInfo
company summary
Merge pull request #29 from tadaya/companyInfo

Company info