adding card types and card views
Merge branch 'master' of https://github.com/otternq/routes