Added cards page
Fixed merge conflict
Merge pull request #11 from indigocode/Jess

Jess