basic stripe functionality
Merge pull request #125 from kheang/master

basic stripe functionality
merging conflicts
Merge branch 'upstream_merge'
merging