Merge pull request #9 from simurai/__mb__simurai__master

Edit flow
Add card.reel

tried to merge Mike's branch, but there were too many conflicts. So this commit is re-creating it manually.