Incorporate Stripe, including dotenv
Fix merge conflicts
Fixed conflict issues
Merge pull request #10 from NadiDami/master

Stripe, and fixed other conflicts