Add trick kind behaivor
Fix last push
Fix conflict
Merge pull request #27 from railsrumble/flow

Flow